diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-04-26 16:33:42 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-04-26 16:33:42 -0400 |
| commit | b1439df72aedec0d96642531edfdc9e3ca8ea673 (patch) | |
| tree | 222bca89790fa8c1a735d3f30de5255b7d0ca855 /conn_tests/test_pubsubserver.py | |
| parent | ea8c40c7b637d656a596e16555a0d8695932a06f (diff) | |
| parent | 5399fdd3a95377bfb5bba993f299664557cabb7c (diff) | |
| download | slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.gz slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.bz2 slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.tar.xz slixmpp-b1439df72aedec0d96642531edfdc9e3ca8ea673.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests/test_pubsubserver.py')
0 files changed, 0 insertions, 0 deletions