diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-01 11:11:54 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-01 11:11:54 -0700 |
| commit | 2f4149c7d05f05c041ce5d393f5a13e1075c3d14 (patch) | |
| tree | 0d2a1b24464e9d6233a04cd3827d6a73fac1e740 /tests/live_multiple_streams.py | |
| parent | fb4275648c1f809ea1eadb3fcd5e6ad1b244d5ab (diff) | |
| parent | b84e3597702e4d049eb8973ce6c3e3236502633a (diff) | |
| download | slixmpp-2f4149c7d05f05c041ce5d393f5a13e1075c3d14.tar.gz slixmpp-2f4149c7d05f05c041ce5d393f5a13e1075c3d14.tar.bz2 slixmpp-2f4149c7d05f05c041ce5d393f5a13e1075c3d14.tar.xz slixmpp-2f4149c7d05f05c041ce5d393f5a13e1075c3d14.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'tests/live_multiple_streams.py')
0 files changed, 0 insertions, 0 deletions