Merge https://github.com/kennethreitz/requests into develop
authorMichael Newman <newmaniese@gmail.com>
Fri, 16 Mar 2012 19:32:50 +0000 (15:32 -0400)
committerMichael Newman <newmaniese@gmail.com>
Fri, 16 Mar 2012 19:32:50 +0000 (15:32 -0400)

Trivial merge