Merge pull request #1845 from Lukasa/proxy_bypass
authorKenneth Reitz <me@kennethreitz.org>
Wed, 8 Jan 2014 18:51:08 +0000 (10:51 -0800)
committerKenneth Reitz <me@kennethreitz.org>
Wed, 8 Jan 2014 18:51:08 +0000 (10:51 -0800)
Resolve proxy_bypass problems.


Trivial merge