Merge pull request #267 from benmao/develop
authorKenneth Reitz <me@kennethreitz.com>
Tue, 15 Nov 2011 03:04:02 +0000 (19:04 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 15 Nov 2011 03:04:02 +0000 (19:04 -0800)
fixed proxy


Trivial merge