Merge pull request #1114 from vlaci/master
authorKenneth Reitz <me@kennethreitz.com>
Fri, 18 Jan 2013 13:40:26 +0000 (05:40 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 18 Jan 2013 13:40:26 +0000 (05:40 -0800)
Keep-alive support for http proxies


Trivial merge