Merge branch 'master' of github.com:kennethreitz/requests

Conflicts:
	requests/compat.py
	setup.py

diff --cc requests/compat.py
index 04cd0e992c9837c124bb8a2f5f944c88997756ec,637b2dd5e044ada16a1a88af6446c5fbc2aa400f..67e058bdb838d64a189f67bbe5c29ade14ee9198
--- 1/requests/compat.py
--- 2/requests/compat.py
+++ b/requests/compat.py
@@@ -81,12 -81,7 +81,6 @@@ except ImportError
  # Specifics
  # ---------
  
- try:
-     import cchardet as chardet
- except ImportError:
-     from .packages import chardet
- 
--
  if is_py2:
      from urllib import quote, unquote, quote_plus, unquote_plus, urlencode
      from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag

diff --cc setup.py
index 9b63551ebc1e0f0993bea0d53b80996cbe826b15,4f6ca91c4a66a374913d3dbc62b1013d7a1714e1..82ee8709c23583ad439341239476683467dedbf7
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -17,7 -17,7 +17,7 @@@ if sys.argv[-1] == 'publish'
  packages = [
      'requests',
      'requests.packages',
-     'requests.packages.charade'
 -    'requests.packages.chardet',
++      'requests.packages.charade',
      'requests.packages.urllib3',
      'requests.packages.urllib3.packages',
      'requests.packages.urllib3.packages.ssl_match_hostname'