diff options
author | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:27:39 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:27:39 -0400 |
commit | e694e4a79172f0cbced79f930ca03767ce3c0792 (patch) | |
tree | f1eba0699b6a3a2752cb04a6299ab5e8e5006574 /sleekxmpp/__init__.py | |
parent | e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76 (diff) | |
parent | b1439df72aedec0d96642531edfdc9e3ca8ea673 (diff) | |
download | slixmpp-e694e4a79172f0cbced79f930ca03767ce3c0792.tar.gz slixmpp-e694e4a79172f0cbced79f930ca03767ce3c0792.tar.bz2 slixmpp-e694e4a79172f0cbced79f930ca03767ce3c0792.tar.xz slixmpp-e694e4a79172f0cbced79f930ca03767ce3c0792.zip |
Merge branch 'stream_features' of github.com:fritzy/SleekXMPP into stream_features
Diffstat (limited to 'sleekxmpp/__init__.py')
0 files changed, 0 insertions, 0 deletions