diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-01 15:17:13 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-01 15:17:13 -0700 |
| commit | 8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5 (patch) | |
| tree | a490670f37860c42c52acfbebf12c680284996f4 /conn_tests/test_pubsubserver.py | |
| parent | 83a73ac9b751f6403a43cb341460a46171e0908b (diff) | |
| parent | 14693233504383d4df0ed092c870d5d7baea6538 (diff) | |
| download | slixmpp-8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5.tar.gz slixmpp-8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5.tar.bz2 slixmpp-8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5.tar.xz slixmpp-8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'conn_tests/test_pubsubserver.py')
0 files changed, 0 insertions, 0 deletions