Merge pull request #1862 from sybeck2k/master
authorKenneth Reitz <me@kennethreitz.org>
Tue, 14 Jan 2014 19:56:04 +0000 (11:56 -0800)
committerKenneth Reitz <me@kennethreitz.org>
Tue, 14 Jan 2014 19:56:04 +0000 (11:56 -0800)
Fixed parsing of username and password encoded in the URI


Trivial merge