Merge branch 'develop' of https://github.com/volker48/requests into develop
authorMarcus McCurdy <marcus.mccurdy@gmail.com>
Sat, 4 Aug 2012 03:18:31 +0000 (23:18 -0400)
committerMarcus McCurdy <marcus.mccurdy@gmail.com>
Sat, 4 Aug 2012 03:18:31 +0000 (23:18 -0400)

Trivial merge