Files
slixmpp/tests/test_stream_roster.py
Lance Stout 484efff156 Merge branch 'develop' into roster
Conflicts:
	setup.py
	sleekxmpp/clientxmpp.py
2011-08-12 16:47:58 -07:00

6.6 KiB