diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-11 17:19:29 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-11 17:19:29 -0800 |
| commit | a0266dac6f30a1bfa89360a16ec70904b552f0a1 (patch) | |
| tree | c1be293ec9e48c78ac9c1c54d6c1e6f65cb13555 /sleekxmpp/thirdparty/socks.py | |
| parent | 8644a83ed9fce8e0be746ce92f87b80534a56bf5 (diff) | |
| parent | ce977a78091189099b339363d4d856c443d29710 (diff) | |
| download | slixmpp-a0266dac6f30a1bfa89360a16ec70904b552f0a1.tar.gz slixmpp-a0266dac6f30a1bfa89360a16ec70904b552f0a1.tar.bz2 slixmpp-a0266dac6f30a1bfa89360a16ec70904b552f0a1.tar.xz slixmpp-a0266dac6f30a1bfa89360a16ec70904b552f0a1.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/thirdparty/socks.py')
0 files changed, 0 insertions, 0 deletions