diff options
author | Lance Stout <lancestout@gmail.com> | 2011-07-03 00:38:22 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-07-03 00:38:22 -0700 |
commit | 9a6eb333e65e58f705aca6a8874d5b65bd52e0e7 (patch) | |
tree | 90df9ed380f10b5db8a6e6f8b018519074ad31ad /conn_tests/testpubsub.py | |
parent | 0224d028e76ba608400fe55602fdb84f8e70f13b (diff) | |
parent | 086bf89d699c88ab89ad1e1975d6022335ca5c04 (diff) | |
download | slixmpp-9a6eb333e65e58f705aca6a8874d5b65bd52e0e7.tar.gz slixmpp-9a6eb333e65e58f705aca6a8874d5b65bd52e0e7.tar.bz2 slixmpp-9a6eb333e65e58f705aca6a8874d5b65bd52e0e7.tar.xz slixmpp-9a6eb333e65e58f705aca6a8874d5b65bd52e0e7.zip |
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests/testpubsub.py')
0 files changed, 0 insertions, 0 deletions