From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 23 Jul 2013 12:23:35 +0000 (-0700)
Subject: Merge pull request #1482 from dpursehouse/fix-testcases-with-proxy
X-Git-Tag: 2.0~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f71bff12266e14ec451e4448b33cb1204a69e0df;p=services%2Fpython-requests.git

Merge pull request #1482 from dpursehouse/fix-testcases-with-proxy

Fix test cases that fail when running behind a proxy
---

f71bff12266e14ec451e4448b33cb1204a69e0df