Merge branch 'develop' of github.com:kennethreitz/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Mon, 7 Nov 2011 19:18:20 +0000 (14:18 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 7 Nov 2011 19:18:20 +0000 (14:18 -0500)

Trivial merge