diff options
author | Nathan Fritz <fritzy@netflint.net> | 2010-01-29 23:58:14 -0800 |
---|---|---|
committer | Nathan Fritz <fritzy@netflint.net> | 2010-01-29 23:58:14 -0800 |
commit | 06fa1fcf332c9e0623dff90db8d1daacdfac87f1 (patch) | |
tree | ff4466691117e0fee66add9d98f2edd378e55236 /sleekxmpp/xmlstream | |
parent | 4d8709859096699ad79b8fce295ab05f2cb31de2 (diff) | |
parent | 5e736f4b978414c111062ffb220e38eb40765db6 (diff) | |
download | slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.gz slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.bz2 slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.xz slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.zip |
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r-- | sleekxmpp/xmlstream/tostring/__init__.py (renamed from sleekxmpp/xmlstream/tostring.py) | 0 | ||||
-rw-r--r-- | sleekxmpp/xmlstream/tostring26/__init__.py (renamed from sleekxmpp/xmlstream/tostring26.py) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/sleekxmpp/xmlstream/tostring.py b/sleekxmpp/xmlstream/tostring/__init__.py index 6603cbb8..6603cbb8 100644 --- a/sleekxmpp/xmlstream/tostring.py +++ b/sleekxmpp/xmlstream/tostring/__init__.py diff --git a/sleekxmpp/xmlstream/tostring26.py b/sleekxmpp/xmlstream/tostring26/__init__.py index 9711c300..9711c300 100644 --- a/sleekxmpp/xmlstream/tostring26.py +++ b/sleekxmpp/xmlstream/tostring26/__init__.py |