Merge branch 'httperror_init' of git://github.com/dmedvinsky/requests
authorKenneth Reitz <me@kennethreitz.com>
Mon, 4 Mar 2013 22:54:25 +0000 (17:54 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 4 Mar 2013 22:54:25 +0000 (17:54 -0500)
Conflicts:
AUTHORS.rst
test_requests.py


Trivial merge