summaryrefslogtreecommitdiff
path: root/tests/test_stream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-09-01 13:57:24 -0700
committerLance Stout <lancestout@gmail.com>2012-09-01 13:57:24 -0700
commitdf9ac58d051e195143875e03ce09a3994ade0e00 (patch)
treebcead3c0efffa670d2de0dc889aa0708e8ba9446 /tests/test_stream.py
parent19a78f63f4a24d7a5ff568608d4323f773d785e2 (diff)
parent357406d801dabcac70d2794ac4c61c70655e704b (diff)
downloadslixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.gz
slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.bz2
slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.tar.xz
slixmpp-df9ac58d051e195143875e03ce09a3994ade0e00.zip
Merge branch 'master' into develop
Diffstat (limited to 'tests/test_stream.py')
0 files changed, 0 insertions, 0 deletions