summaryrefslogtreecommitdiff
path: root/conn_tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-08 10:02:22 -0700
committerLance Stout <lancestout@gmail.com>2011-06-08 10:02:22 -0700
commit823c13707db1251b06a9bb06a2d41eb5d0851e94 (patch)
treea8e6b356fc54c9a3c8256ba796d1f27c32d34aca /conn_tests
parent8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5 (diff)
parent4266ee0fa4b2520ed930047ea73d6ac82d9b1f83 (diff)
downloadslixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.tar.gz
slixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.tar.bz2
slixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.tar.xz
slixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests')
0 files changed, 0 insertions, 0 deletions