Merge branch 'feature-content-streaming' of https://github.com/mitsuhiko/requests...
authorKenneth Reitz <me@kennethreitz.com>
Fri, 14 Oct 2011 01:54:42 +0000 (21:54 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 14 Oct 2011 01:54:42 +0000 (21:54 -0400)
commit46f0146adfb6faaef4d47e8e1037dd1156b57a3a
treedc64f638efe64dec7fadc415c7cc47790e237d07
parentb14fa0764bc5e1340762e45af999334e9b74f642
parent0d6773c68ca04cc90c004cb3a98313dd035c5e22
Merge branch 'feature-content-streaming' of https://github.com/mitsuhiko/requests into feature/content-stream

Conflicts:
AUTHORS
HISTORY.rst
docs/api.rst
docs/community/faq.rst
docs/user/intro.rst
requests/api.py
requests/models.py
AUTHORS
HISTORY.rst
docs/community/faq.rst
docs/user/install.rst
docs/user/intro.rst
requests/api.py
requests/core.py
requests/models.py
test_requests.py