Lance Stout 83a73ac9b7 Merge branch 'develop' into stream_features
Conflicts:
	sleekxmpp/clientxmpp.py
2011-05-31 11:05:54 -07:00
..
2011-01-27 18:05:05 -05:00
2010-10-17 22:04:42 -04:00
2009-06-03 22:56:51 +00:00
2009-06-03 22:56:51 +00:00
2009-06-03 22:56:51 +00:00