Merge pull request #1162 from Lukasa/proxy_auth
authorKenneth Reitz <me@kennethreitz.com>
Wed, 6 Feb 2013 21:05:04 +0000 (13:05 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 6 Feb 2013 21:05:04 +0000 (13:05 -0800)
Proxy Authorization Headers


Trivial merge