summaryrefslogtreecommitdiff
path: root/sleekxmpp/features/feature_mechanisms/mechanisms.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-20 16:27:55 -0700
committerLance Stout <lancestout@gmail.com>2011-06-20 16:27:55 -0700
commitfa716457a5cc8abf207e1da903202398dfb26878 (patch)
treecb10108eb4d19c30387fc22c5d53a96e3f80431f /sleekxmpp/features/feature_mechanisms/mechanisms.py
parent4efd41f1ba679348487e1e88b7426830e92a9f9b (diff)
parentd8d9e8df16c07bd13bbac72e4445a2930407b244 (diff)
downloadslixmpp-fa716457a5cc8abf207e1da903202398dfb26878.tar.gz
slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.tar.bz2
slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.tar.xz
slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/mechanisms.py')
0 files changed, 0 insertions, 0 deletions