Merge branch 'timeout' of https://github.com/jgorset/requests into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 21 Apr 2011 14:28:26 +0000 (10:28 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 21 Apr 2011 14:28:26 +0000 (10:28 -0400)
commit83494152fe6db7e22dbeeff47bc28c253073d00a
tree720ed717349a75142ea5027782b981a69bceae80
parentf6f636f74cdb0e94574539428787babfbcdd3b77
parent39e9424f012dcae29d9b64d97582f7a80206c5d0
Merge branch 'timeout' of https://github.com/jgorset/requests into develop