summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 21:12:53 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 21:12:53 -0400
commit4d3593ac8698676e3b4b987120c19db07c6a76bb (patch)
treea097c878923a5852ab602c5df3c3b770bea61582 /sleekxmpp/basexmpp.py
parentc49a8e91142121251ccb2cacd3b3f0d5cd78db97 (diff)
parent6b274a2543744f9b94823f5bd2a6c23ec8cc3f75 (diff)
downloadslixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.tar.gz
slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.tar.bz2
slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.tar.xz
slixmpp-4d3593ac8698676e3b4b987120c19db07c6a76bb.zip
Merge branch 'develop' into roster
Conflicts: tests/test_stream_roster.py
Diffstat (limited to 'sleekxmpp/basexmpp.py')
0 files changed, 0 insertions, 0 deletions