Merge pull request #1515 from schlamar/https-proxy-2.0
authorKenneth Reitz <me@kennethreitz.com>
Wed, 14 Aug 2013 20:41:08 +0000 (13:41 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 14 Aug 2013 20:41:08 +0000 (13:41 -0700)
[2.0] Https proxy support


Trivial merge