summaryrefslogtreecommitdiff
path: root/tests/__init__$py.class
AgeCommit message (Collapse)Author
2010-11-17Merge branch 'roster' of github.com:fritzy/SleekXMPP into rosterLance Stout
Conflicts: sleekxmpp/basexmpp.py sleekxmpp/roster.py sleekxmpp/test/sleektest.py tests/test_stream_presence.py tests/test_stream_roster.py