diff options
author | Lance Stout <lancestout@gmail.com> | 2011-12-31 02:16:08 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-12-31 02:16:08 -0500 |
commit | 9a5e2ae7686a2dad72f2aea2592ab002111003da (patch) | |
tree | 0025aa4f8ef2387e6a3aa5609054a4143099b43c /sleekxmpp/plugins/xep_0060/stanza/__init__.py | |
parent | e0545bf0bc06893ca905b2a3ebb4d09c76c24f0c (diff) | |
parent | f9cd051209e765c338d3c0e7ed4b3638e89b4a01 (diff) | |
download | slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.tar.gz slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.tar.bz2 slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.tar.xz slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.zip |
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'sleekxmpp/plugins/xep_0060/stanza/__init__.py')
0 files changed, 0 insertions, 0 deletions