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

3.3 KiB

Raw History

View raw