diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-14 14:18:40 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-14 14:18:40 -0700 |
commit | 8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2 (patch) | |
tree | 57825ebbe69d844e2caec9a961f98ed841fd02b1 /tests/live_multiple_streams.py | |
parent | 6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2 (diff) | |
parent | dd41a85efcd85bb3a4eb81187041106c65c6aa2d (diff) | |
download | slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.gz slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.bz2 slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.tar.xz slixmpp-8fada4d015ae2f6ab2e0b0c7d0b5cf2a072753d2.zip |
Merge branch 'develop' into exceptions
Diffstat (limited to 'tests/live_multiple_streams.py')
0 files changed, 0 insertions, 0 deletions