Merge branch 'feature/timeout' into develop
authorKenneth Reitz <me@kennethreitz.com>
Thu, 12 May 2011 07:56:13 +0000 (03:56 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 12 May 2011 07:56:13 +0000 (03:56 -0400)
commita046a04aa26c82fd5c692783cd670c0ac4f8d24c
tree73146c3ed385428e6def073af830911cce6022c7
parent59dd3ed4596809a56d5103b45a20f61c18d72e77
parent45ca6d8a7869468a1ccd934b077573a1843c7f43
Merge branch 'feature/timeout' into develop
requests/core.py