Merge branch 'master' into desktop

CouchPotato · Oct 11, 2014 · 92f9743 · 92f9743
2 parents 0567504 + 1b151fb
commit 92f9743
Show file tree

Hide file tree

Showing 39 changed files with 1 addition and 7,521 deletions.
diff --git a/libs/requests/compat.py b/libs/requests/compat.py
@@ -4,7 +4,7 @@
 pythoncompat
 """
 
-from .packages import chardet
+import chardet
 
 import sys
 

diff --git a/libs/requests/packages/chardet/__init__.py b/libs/requests/packages/chardet/__init__.py
diff --git a/libs/requests/packages/chardet/big5freq.py b/libs/requests/packages/chardet/big5freq.py
diff --git a/libs/requests/packages/chardet/big5prober.py b/libs/requests/packages/chardet/big5prober.py
diff --git a/libs/requests/packages/chardet/chardetect.py b/libs/requests/packages/chardet/chardetect.py
diff --git a/libs/requests/packages/chardet/chardistribution.py b/libs/requests/packages/chardet/chardistribution.py