summaryrefslogtreecommitdiff
path: root/sleekxmpp/thirdparty/__init__.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-07 10:40:22 -0700
committerLance Stout <lancestout@gmail.com>2012-06-07 10:40:22 -0700
commit7247efe05518ad9468dc52a6066f38f78cbc599e (patch)
tree115d2434304da7985406009ba5f6cbee45748949 /sleekxmpp/thirdparty/__init__.py
parentf5652a667bfcf896c6078888fe7ec68e21db305d (diff)
parent8def3758e4e849f25001e1e76616fcc3836bd1c2 (diff)
downloadslixmpp-7247efe05518ad9468dc52a6066f38f78cbc599e.tar.gz
slixmpp-7247efe05518ad9468dc52a6066f38f78cbc599e.tar.bz2
slixmpp-7247efe05518ad9468dc52a6066f38f78cbc599e.tar.xz
slixmpp-7247efe05518ad9468dc52a6066f38f78cbc599e.zip
Merge pull request #169 from SeyZ/develop
xep_0065 plugin (Socks5 Bytestreams)
Diffstat (limited to 'sleekxmpp/thirdparty/__init__.py')
-rw-r--r--sleekxmpp/thirdparty/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/thirdparty/__init__.py b/sleekxmpp/thirdparty/__init__.py
index b9c82a7f..7ec045a6 100644
--- a/sleekxmpp/thirdparty/__init__.py
+++ b/sleekxmpp/thirdparty/__init__.py
@@ -8,5 +8,5 @@ try:
except:
from sleekxmpp.thirdparty.gnupg import GPG
-from sleekxmpp.thirdparty import suelta
+from sleekxmpp.thirdparty import suelta, socks
from sleekxmpp.thirdparty.mini_dateutil import tzutc, tzoffset, parse_iso