diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-18 17:36:35 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-18 17:36:35 -0400 |
commit | b048f8d733dd7121d820fa196b5de5c9a77adae2 (patch) | |
tree | cbd1c1e0bccbd1a48cd21f1a90c82781f61294c6 /conn_tests/test_pubsubserver.py | |
parent | f65f88325b8d76a9b44a7cb4006a0a62d061e7ef (diff) | |
parent | dbf6780345bb202d4a0a49034fbfc4535e844170 (diff) | |
download | slixmpp-b048f8d733dd7121d820fa196b5de5c9a77adae2.tar.gz slixmpp-b048f8d733dd7121d820fa196b5de5c9a77adae2.tar.bz2 slixmpp-b048f8d733dd7121d820fa196b5de5c9a77adae2.tar.xz slixmpp-b048f8d733dd7121d820fa196b5de5c9a77adae2.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/test_pubsubserver.py')
0 files changed, 0 insertions, 0 deletions