From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 4 Mar 2013 22:54:25 +0000 (-0500)
Subject: Merge branch 'httperror_init' of git://github.com/dmedvinsky/requests
X-Git-Tag: v1.2.0~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0d4b23cea430ba1dce407f4325d9362c55d577c;p=services%2Fpython-requests.git

Merge branch 'httperror_init' of git://github.com/dmedvinsky/requests

Conflicts:
	AUTHORS.rst
	test_requests.py
---

c0d4b23cea430ba1dce407f4325d9362c55d577c