Merge branch 'develop' into feature/rewrite
authorKenneth Reitz <me@kennethreitz.com>
Thu, 27 Oct 2011 04:57:03 +0000 (00:57 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 27 Oct 2011 04:57:03 +0000 (00:57 -0400)
commit5b54b3e53f601cf7b56efc7df5980a6c19bb7604
tree55be03c032b3d2810b67e3d605c5096ad0ad5eac
parenta957bcfd7b664852d5e1c9b673357602d799d446
parente43b438729b31a1295b372d8668c4f2b3132f016
Merge branch 'develop' into feature/rewrite

Conflicts:
requests/__init__.py
requests/defaults.py
requests/sessions.py
test_requests.py