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)
1  2 
requests/core.py

Simple merge