diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-07-01 15:19:37 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-07-01 15:19:37 -0700 |
| commit | 04def6d9256b0d5ef97d75b08ae9330d3c253948 (patch) | |
| tree | 04d04ff175387c2bc31f26be0e360e33b9012a81 /tests/live_multiple_streams.py | |
| parent | 634f5d691bab9855deddc4c201389bb60470d76e (diff) | |
| parent | 2a2ac73845ffc8695e2bc55746f45e1a18d55e6c (diff) | |
| download | slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.tar.gz slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.tar.bz2 slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.tar.xz slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'tests/live_multiple_streams.py')
0 files changed, 0 insertions, 0 deletions