summaryrefslogtreecommitdiff
path: root/sleekxmpp/features/feature_mechanisms
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-15 15:36:30 -0700
committerLance Stout <lancestout@gmail.com>2012-06-15 15:36:30 -0700
commit55d332bcc86c2775f259a2278aa85ba71126e978 (patch)
tree60e89fec901ef9fa2d1219a34a093b2c5e3f2d7f /sleekxmpp/features/feature_mechanisms
parentf89df6e70cee5840dbdbf41e68ae7d2384814373 (diff)
parentee702f40710219290508f95ac01df50a96d04f3c (diff)
downloadslixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.gz
slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.bz2
slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.tar.xz
slixmpp-55d332bcc86c2775f259a2278aa85ba71126e978.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms')
0 files changed, 0 insertions, 0 deletions