slixmpp/sleekxmpp
Lance Stout 26aca2b789 Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster
Conflicts:
	sleekxmpp/basexmpp.py
	sleekxmpp/roster.py
	sleekxmpp/test/sleektest.py
	tests/test_stream_presence.py
	tests/test_stream_roster.py
2010-11-17 02:01:12 -05:00
..
2010-11-17 01:54:30 -05:00
2010-10-06 14:20:32 -04:00
2010-11-17 01:49:51 -05:00
2010-11-17 01:49:51 -05:00
2010-10-25 15:09:56 -04:00
2010-11-17 01:54:30 -05:00