Merge pull request #643 from gwrtheyrn/docs_proxy_auth
authorKenneth Reitz <me@kennethreitz.com>
Wed, 30 May 2012 19:48:33 +0000 (12:48 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 30 May 2012 19:48:33 +0000 (12:48 -0700)
Added information about HTTP proxy authentication to docs


Trivial merge