Merge branch 'develop' of https://github.com/kennethreitz/requests into urllib3-attri...
authorAndrey Petrov <andrey.petrov@shazow.net>
Sat, 7 Jan 2012 23:19:02 +0000 (15:19 -0800)
committerAndrey Petrov <andrey.petrov@shazow.net>
Sat, 7 Jan 2012 23:19:02 +0000 (15:19 -0800)

Trivial merge