Merge branch 'develop' of https://github.com/atdt/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 22 Dec 2011 16:55:13 +0000 (11:55 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 22 Dec 2011 16:55:13 +0000 (11:55 -0500)
commit9d88ac7b50f05b1196672ba7df88d2321c2d6ee0
treefe6a027009f5e010b3c3d16c809f84188603cf43
parent75dc012f41d26c2eb8348cae319b26721ec4f410
parentf214b91d770ef194f9fad7041a1356ff27097ae5
Merge branch 'develop' of https://github.com/atdt/requests into develop

Conflicts:
AUTHORS.rst
AUTHORS.rst