diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-17 10:18:11 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-17 10:18:11 -0700 |
| commit | ff28b0a005410a2604b7b889e0347ae9d6a7efd9 (patch) | |
| tree | 7f4299c56175ad17abad6f1ac360f565e9cf3712 /sleekxmpp/thirdparty/socks.py | |
| parent | a249f8736ac601dff8e5c06d850016383cc28d82 (diff) | |
| parent | 8a03bd72ae5d07ebee2bcd13e66441a94edd4f1a (diff) | |
| download | slixmpp-ff28b0a005410a2604b7b889e0347ae9d6a7efd9.tar.gz slixmpp-ff28b0a005410a2604b7b889e0347ae9d6a7efd9.tar.bz2 slixmpp-ff28b0a005410a2604b7b889e0347ae9d6a7efd9.tar.xz slixmpp-ff28b0a005410a2604b7b889e0347ae9d6a7efd9.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/thirdparty/socks.py')
0 files changed, 0 insertions, 0 deletions