summaryrefslogtreecommitdiff
path: root/conn_tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-31 11:05:54 -0700
committerLance Stout <lancestout@gmail.com>2011-05-31 11:05:54 -0700
commit83a73ac9b751f6403a43cb341460a46171e0908b (patch)
treec60877a9c6896bbefe8fcb51b606a20abac165ee /conn_tests
parentccb0eeefbd58361283e4e92d75e5d17aa76c70c7 (diff)
parenta81162edd2434756e21d7f9a79d71d770a43db7b (diff)
downloadslixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.gz
slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.bz2
slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.xz
slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.zip
Merge branch 'develop' into stream_features
Conflicts: sleekxmpp/clientxmpp.py
Diffstat (limited to 'conn_tests')
0 files changed, 0 insertions, 0 deletions