summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-12-29 15:17:34 -0800
committerLance Stout <lancestout@gmail.com>2012-12-29 15:17:34 -0800
commit0998429b07cfc23564847237b5873819a65e531c (patch)
tree41729d029652e925251b0bbc47023062b3e0dcc3 /sleekxmpp/xmlstream/xmlstream.py
parent9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7 (diff)
parent597eb1779c497ad850fe3c03fd480fea5c9ef7ea (diff)
downloadslixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.gz
slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.bz2
slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.xz
slixmpp-0998429b07cfc23564847237b5873819a65e531c.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
0 files changed, 0 insertions, 0 deletions