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)
commit106bae645763fe36f5f3df4bc3203b9f8d5f4976
treecef7bbe990ba7659291c04461801637046e0e957
parent64fd0baa02577d764808f08d7887365864406cb5
parent65c19bc0e0c44da54ff46d2237264800e2f2238f
Merge pull request #850 from SecurityForUs/fix_proxies_2.7-3

Resolve issue in #849