summaryrefslogtreecommitdiff
path: root/sleekxmpp/features/feature_mechanisms/mechanisms.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-09 22:14:00 -0800
committerLance Stout <lancestout@gmail.com>2013-01-09 22:14:00 -0800
commit8644a83ed9fce8e0be746ce92f87b80534a56bf5 (patch)
treed4adb5248b8a037152fd9eb3c82a3024a5ca4ca7 /sleekxmpp/features/feature_mechanisms/mechanisms.py
parentf04f4e4a1a67fa3ec49f6badb02cdc062ebef477 (diff)
parent7b45245b1dd557b9dea98fdcce96d1f8f2a2771d (diff)
downloadslixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.tar.gz
slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.tar.bz2
slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.tar.xz
slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/mechanisms.py')
0 files changed, 0 insertions, 0 deletions