summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/base.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 13:26:21 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 13:26:21 -0400
commite2de82ac8d45d2a6709154ef27dbeb3d08ce1a76 (patch)
treef1eba0699b6a3a2752cb04a6299ab5e8e5006574 /sleekxmpp/plugins/base.py
parentf125c11a810cf308473394262879f94166c3f564 (diff)
parent9f1648328f17b608651989606b9cf2636cdcfbec (diff)
downloadslixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.gz
slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.bz2
slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.xz
slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.zip
Merge branch 'develop' into stream_features
Conflicts: sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/plugins/base.py')
0 files changed, 0 insertions, 0 deletions