diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-24 09:36:35 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-24 09:36:35 -0400 |
commit | bf2f2782b7b64be97948f56e21d55b969072c4dc (patch) | |
tree | 45001e4822e5dc654de2658ee88c73966e907ef1 /sleekxmpp/componentxmpp.py | |
parent | 694673b9bdc108ae109efd4dafa8893a22952b94 (diff) | |
parent | a3d111be12144d9dea80165d84cd8168714d3d54 (diff) | |
download | slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.tar.gz slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.tar.bz2 slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.tar.xz slixmpp-bf2f2782b7b64be97948f56e21d55b969072c4dc.zip |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/componentxmpp.py')
0 files changed, 0 insertions, 0 deletions