Merge branch 'develop' of github.com:kennethreitz/requests into develop
authorIdan Gazit <idan@gazit.me>
Wed, 14 Mar 2012 00:05:24 +0000 (17:05 -0700)
committerIdan Gazit <idan@gazit.me>
Wed, 14 Mar 2012 00:05:24 +0000 (17:05 -0700)

Trivial merge