slixmpp/sleekxmpp
Lance Stout e3b14bc5a9 Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/clientxmpp.py
	tests/test_stream_roster.py
2011-05-20 13:23:48 -04:00
..
2011-04-08 16:41:45 -04:00
2011-04-26 16:33:32 -04:00
2011-04-08 16:39:39 -04:00
2011-04-15 17:43:12 -07:00