diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-02-10 11:29:57 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-02-10 11:29:57 -0800 |
| commit | da3223ac92f15e15ae03cece00ff487d81913c77 (patch) | |
| tree | 3380d162b278f328c9c83afa1ca4272ed1f2f203 /sleekxmpp/thirdparty/__init__.py | |
| parent | 75a792eb6f8df68d47db8014852425d9ee36d6a9 (diff) | |
| parent | b0fed5a48dc6543a1eedf3ff2cc96f671fbfef0c (diff) | |
| download | slixmpp-da3223ac92f15e15ae03cece00ff487d81913c77.tar.gz slixmpp-da3223ac92f15e15ae03cece00ff487d81913c77.tar.bz2 slixmpp-da3223ac92f15e15ae03cece00ff487d81913c77.tar.xz slixmpp-da3223ac92f15e15ae03cece00ff487d81913c77.zip | |
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/thirdparty/__init__.py')
| -rw-r--r-- | sleekxmpp/thirdparty/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sleekxmpp/thirdparty/__init__.py b/sleekxmpp/thirdparty/__init__.py index 502be6b6..2a1db717 100644 --- a/sleekxmpp/thirdparty/__init__.py +++ b/sleekxmpp/thirdparty/__init__.py @@ -8,4 +8,5 @@ try: except: from sleekxmpp.thirdparty.gnupg import GPG +from sleekxmpp.thirdparty import socks from sleekxmpp.thirdparty.mini_dateutil import tzutc, tzoffset, parse_iso |