summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-18 17:39:43 -0400
committerLance Stout <lancestout@gmail.com>2011-03-18 17:39:43 -0400
commit566ec8a5f90b8d38d53e3c98212e5a3c6cec6206 (patch)
tree7794badfafde3962acd4e4bc7161c733d829ada5 /examples
parentdca8516cec2d2802930491ea886cd98f81727cbb (diff)
parentdbf6780345bb202d4a0a49034fbfc4535e844170 (diff)
downloadslixmpp-566ec8a5f90b8d38d53e3c98212e5a3c6cec6206.tar.gz
slixmpp-566ec8a5f90b8d38d53e3c98212e5a3c6cec6206.tar.bz2
slixmpp-566ec8a5f90b8d38d53e3c98212e5a3c6cec6206.tar.xz
slixmpp-566ec8a5f90b8d38d53e3c98212e5a3c6cec6206.zip
Merge branch 'develop' into stream_features
Conflicts: sleekxmpp/xmlstream/stanzabase.py
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions