diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-01-10 16:27:18 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-01-10 16:27:18 -0500 |
| commit | 05da8cc3d1f7df7e605914a06edc4f7ddd737432 (patch) | |
| tree | 0a262a2ebfd42a0e6b1fcc4f79d2f449507c5aab /conn_tests/test_pubsubserver.py | |
| parent | 23e499998fc36b377e3adb77d3d59f885d94f21d (diff) | |
| parent | fe3f8dde4b4eb19e1c1213bb56d8678f25000f37 (diff) | |
| download | slixmpp-05da8cc3d1f7df7e605914a06edc4f7ddd737432.tar.gz slixmpp-05da8cc3d1f7df7e605914a06edc4f7ddd737432.tar.bz2 slixmpp-05da8cc3d1f7df7e605914a06edc4f7ddd737432.tar.xz slixmpp-05da8cc3d1f7df7e605914a06edc4f7ddd737432.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/test_pubsubserver.py')
0 files changed, 0 insertions, 0 deletions