Lance Stout 566ec8a5f9 Merge branch 'develop' into stream_features
Conflicts:
	sleekxmpp/xmlstream/stanzabase.py
2011-03-18 17:39:43 -04: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