Merge pull request #850 from SecurityForUs/fix_proxies_2.7-3
authorKenneth Reitz <me@kennethreitz.com>
Wed, 12 Sep 2012 17:58:03 +0000 (10:58 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 12 Sep 2012 17:58:03 +0000 (10:58 -0700)
Resolve issue in #849


Trivial merge