Merge pull request #1439 from voberoi/master
authorKenneth Reitz <me@kennethreitz.com>
Mon, 15 Jul 2013 13:22:53 +0000 (06:22 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 15 Jul 2013 13:22:53 +0000 (06:22 -0700)
Make sure netrc doesn't override any authentication settings explicitly set by the client


Trivial merge