diff options
author | Lance Stout <lancestout@gmail.com> | 2011-04-11 14:23:47 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-04-11 14:23:47 -0400 |
commit | ea8c40c7b637d656a596e16555a0d8695932a06f (patch) | |
tree | 35aeab627f7f66120fc1df790c0376ce005cbe24 /sleekxmpp/xmlstream/xmlstream.py | |
parent | ae5ce170355de59cfd7913f85f7444f2f92bf21a (diff) | |
parent | 1d891858b63c1e3ac10a39920c3e65159cfc8d72 (diff) | |
download | slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.tar.gz slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.tar.bz2 slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.tar.xz slixmpp-ea8c40c7b637d656a596e16555a0d8695932a06f.zip |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
0 files changed, 0 insertions, 0 deletions