Merge pull request #1400 from jam/master
authorKenneth Reitz <me@kennethreitz.com>
Sat, 8 Jun 2013 10:20:18 +0000 (03:20 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 8 Jun 2013 10:20:18 +0000 (03:20 -0700)
Retrieve environment proxies using standard library functions

1  2 
AUTHORS.rst

diff --cc AUTHORS.rst
Simple merge