Lance Stout d5b3a52827 Merge branch 'develop' into stream_features
Conflicts:
	sleekxmpp/xmlstream/stanzabase.py
2011-02-14 16:26:23 -05:00
..
2010-10-07 19:42:28 -04:00
2010-10-07 10:58:13 -04:00
2010-11-05 21:18:48 -04:00
2010-10-07 10:58:13 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2011-02-08 21:09:49 -05:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2011-01-27 18:05:05 -05:00