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)
commitc0d4b23cea430ba1dce407f4325d9362c55d577c
tree354bc2402b083b2c3e7f0504a0bf74a2c55aacbe
parentb14584f36eca344ed5033d1d2f5a59490fadca56
parentc4f9340fb4df41d7a8be66ee41c40bfed64ec6d6
Merge branch 'httperror_init' of git://github.com/dmedvinsky/requests

Conflicts:
AUTHORS.rst
test_requests.py