Merge branch 'proxy_auth' of https://github.com/chrisguitarguy/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Mon, 19 Dec 2011 00:11:39 +0000 (19:11 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 19 Dec 2011 00:11:39 +0000 (19:11 -0500)

Trivial merge