summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-15 10:56:33 -0700
committerLance Stout <lancestout@gmail.com>2011-06-15 10:56:33 -0700
commit4efd41f1ba679348487e1e88b7426830e92a9f9b (patch)
tree93586c2f232374f61c2a2ae82dc90f18e817a181 /tests
parent5d11ab269d721a6360420798cfa5243e63bf8013 (diff)
parent58aa944a5e07032fc8d5770347f82e7c2ce6c948 (diff)
downloadslixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.tar.gz
slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.tar.bz2
slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.tar.xz
slixmpp-4efd41f1ba679348487e1e88b7426830e92a9f9b.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions