summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/old_0060.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-09-13 11:00:58 -0700
committerLance Stout <lancestout@gmail.com>2012-09-13 11:00:58 -0700
commit67147570e9be7f51fd079c98f1d6db35fe28563c (patch)
tree65d5ba86be1cbc7fc6cebca7a547b5efebceb028 /sleekxmpp/plugins/old_0060.py
parentdf9ac58d051e195143875e03ce09a3994ade0e00 (diff)
parentfb3e6b7e35bb949f73a756ae5be683e2fec12454 (diff)
downloadslixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.gz
slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.bz2
slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.tar.xz
slixmpp-67147570e9be7f51fd079c98f1d6db35fe28563c.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/old_0060.py')
0 files changed, 0 insertions, 0 deletions