diff options
author | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:46:36 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:46:36 -0400 |
commit | d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a (patch) | |
tree | 2630acba573d0365b8f0b93ec698700b0d0cc867 /conn_tests/testpubsub.py | |
parent | e3b14bc5a9fde7037b309359be8ff1abf5447735 (diff) | |
parent | 6a07e7cbe3e995f44ca3ba75a0ff83616269cf5a (diff) | |
download | slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.tar.gz slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.tar.bz2 slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.tar.xz slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testpubsub.py')
0 files changed, 0 insertions, 0 deletions