Merge pull request #1482 from dpursehouse/fix-testcases-with-proxy
authorKenneth Reitz <me@kennethreitz.com>
Tue, 23 Jul 2013 12:23:35 +0000 (05:23 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 23 Jul 2013 12:23:35 +0000 (05:23 -0700)
Fix test cases that fail when running behind a proxy

1  2 
test_requests.py

Simple merge