summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/__init__.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 21:24:09 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 21:26:45 -0400
commit4c7da3899ee47778b749211edf5665cc700eb613 (patch)
treea097c878923a5852ab602c5df3c3b770bea61582 /sleekxmpp/plugins/__init__.py
parent4d3593ac8698676e3b4b987120c19db07c6a76bb (diff)
parent4bb226147a0faa3b0c92934f64585357bb197f68 (diff)
downloadslixmpp-4c7da3899ee47778b749211edf5665cc700eb613.tar.gz
slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.tar.bz2
slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.tar.xz
slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.zip
Merge branch 'develop' into roster
Conflicts: tests/test_stream_roster.py
Diffstat (limited to 'sleekxmpp/plugins/__init__.py')
0 files changed, 0 insertions, 0 deletions