Merge branch 'develop' of https://github.com/jbochi/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 14 Aug 2011 14:39:47 +0000 (10:39 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 14 Aug 2011 14:39:47 +0000 (10:39 -0400)

Trivial merge