Merge branch 'develop' of github.com:kennethreitz/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 22 Mar 2012 19:00:51 +0000 (15:00 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 22 Mar 2012 19:00:51 +0000 (15:00 -0400)

Trivial merge