diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-08 10:01:52 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-08 10:01:52 -0700 |
commit | 8eb59072b4d5b88a0741e7ef7bb61fa357bffeae (patch) | |
tree | 37303e7a3bbc6e8a093ce3f9457e5a31c6822d8b /conn_tests/testpubsub.py | |
parent | 788a5b73f9392c49e1bab088d558ea4a337bea2d (diff) | |
parent | 4266ee0fa4b2520ed930047ea73d6ac82d9b1f83 (diff) | |
download | slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.tar.gz slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.tar.bz2 slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.tar.xz slixmpp-8eb59072b4d5b88a0741e7ef7bb61fa357bffeae.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'conn_tests/testpubsub.py')
0 files changed, 0 insertions, 0 deletions