Lance Stout 5820d49cd4 Merge branch 'master' into develop
Conflicts:
	sleekxmpp/basexmpp.py
2012-06-19 21:50:33 -07:00
..
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-03-12 19:32:19 -07:00
2012-06-19 18:19:44 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 18:19:44 -07:00
2012-03-12 19:32:19 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-03-12 19:32:19 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-03-12 19:32:19 -07:00
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00
2012-03-12 19:32:20 -07:00
2012-06-19 01:29:48 -07:00
2012-03-12 19:32:20 -07:00
2012-06-19 21:50:33 -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
2012-06-19 01:29:48 -07:00
2012-06-19 01:29:48 -07:00