diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-22 12:00:01 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-22 12:00:01 -0400 |
commit | e1360ae04946a4b6f9fe7ed19f9349ce24405dd1 (patch) | |
tree | 7f0ecd15d0b242b05d43bdc60aa064e399778f9e /tests/live_multiple_streams.py | |
parent | b048f8d733dd7121d820fa196b5de5c9a77adae2 (diff) | |
parent | 86a6b40fd81daa7d0e976dbc63f33544060c75d1 (diff) | |
download | slixmpp-e1360ae04946a4b6f9fe7ed19f9349ce24405dd1.tar.gz slixmpp-e1360ae04946a4b6f9fe7ed19f9349ce24405dd1.tar.bz2 slixmpp-e1360ae04946a4b6f9fe7ed19f9349ce24405dd1.tar.xz slixmpp-e1360ae04946a4b6f9fe7ed19f9349ce24405dd1.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'tests/live_multiple_streams.py')
0 files changed, 0 insertions, 0 deletions