Lance Stout 06a9d9fc30 Merge branch 'master' into develop
Conflicts:
	sleekxmpp/thirdparty/__init__.py
2012-07-31 21:33:19 -07:00
..
2012-07-30 19:15:10 -07:00
2012-07-31 09:20:57 -07:00
2012-07-30 19:15:10 -07:00
2012-07-30 19:15:10 -07:00
2012-06-19 01:29:48 -07:00
2012-07-30 19:15:10 -07:00
2012-07-31 21:33:19 -07:00
2011-11-19 12:07:57 -08:00
2011-11-19 12:07:57 -08:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00