diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-05 11:33:47 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-05 11:33:47 -0500 |
| commit | 8fd2efa2fa50751af7b5182ad7793295c540d294 (patch) | |
| tree | 7639768de4d93b00e998f3575b02830b2ac97b44 /conn_tests/test_pubsubserver.py | |
| parent | 79f1aa0e1ba7dd29bf597beeae924b96950f9416 (diff) | |
| parent | 6b6995bb0b80c91eda72bc92974f68133cef93a3 (diff) | |
| download | slixmpp-8fd2efa2fa50751af7b5182ad7793295c540d294.tar.gz slixmpp-8fd2efa2fa50751af7b5182ad7793295c540d294.tar.bz2 slixmpp-8fd2efa2fa50751af7b5182ad7793295c540d294.tar.xz slixmpp-8fd2efa2fa50751af7b5182ad7793295c540d294.zip | |
Merge branch 'develop-1.1' into develop
Diffstat (limited to 'conn_tests/test_pubsubserver.py')
0 files changed, 0 insertions, 0 deletions