diff options
author | Lance Stout <lancestout@gmail.com> | 2011-01-05 16:53:33 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-01-05 16:53:33 -0500 |
commit | c156a4f723073e1e6394803b5bb1613227947266 (patch) | |
tree | 1f7aaf623e4cdca994969282fb7468fa85712d37 /sleekxmpp/componentxmpp.py | |
parent | 3657bf66363844bf7351ea84279eeb74b0449d5f (diff) | |
parent | 8b29431cdeff5647208e3eab108bba9e9c8318fc (diff) | |
download | slixmpp-c156a4f723073e1e6394803b5bb1613227947266.tar.gz slixmpp-c156a4f723073e1e6394803b5bb1613227947266.tar.bz2 slixmpp-c156a4f723073e1e6394803b5bb1613227947266.tar.xz slixmpp-c156a4f723073e1e6394803b5bb1613227947266.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/componentxmpp.py')
0 files changed, 0 insertions, 0 deletions