summaryrefslogtreecommitdiff
path: root/sleekxmpp/roster
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-05 14:08:32 -0700
committerLance Stout <lancestout@gmail.com>2011-08-05 14:08:32 -0700
commit6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae (patch)
treeea302d475b38c694bb147fb3e730ee488b3bf717 /sleekxmpp/roster
parentea95811c4c76ae96bc41c4fab48886dd2e85c7a9 (diff)
parent148a23579c199d218325c88d7b6f567f42c7a36a (diff)
downloadslixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.gz
slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.bz2
slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.xz
slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.zip
Merge branch 'master' into develop
Adds hotfix for ANONYMOUS mech support. Conflicts: sleekxmpp/__init__.py
Diffstat (limited to 'sleekxmpp/roster')
0 files changed, 0 insertions, 0 deletions