Merge branch 'keytype' of git://github.com/Lukasa/requests into 2.0

diff --cc requests/models.py
index 1a6ac72,10fa1f0..ee9c329
--- 1/requests/models.py
--- 2/requests/models.py
+++ b/requests/models.py
@@@ -25,10 -23,10 +25,10 @@@ from .exceptions import 
  from .utils import (
      guess_filename, get_auth_from_url, requote_uri,
      stream_decode_response_unicode, to_key_val_list, parse_header_links,
-     iter_slices, guess_json_utf, super_len)
+     iter_slices, guess_json_utf, super_len, to_native_string)
  from .compat import (
      cookielib, urlunparse, urlsplit, urlencode, str, bytes, StringIO,
 -    is_py2, chardet, json, builtin_str, basestring)
 +    is_py2, chardet, json, builtin_str, basestring, IncompleteRead)
  
  CONTENT_CHUNK_SIZE = 10 * 1024
  ITER_CHUNK_SIZE = 512

diff --cc test_requests.py
Simple merge