Merge branch 'master' into develop
authorKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 20:36:22 +0000 (16:36 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 19 Oct 2011 20:36:22 +0000 (16:36 -0400)
1  2 
requests/api.py

diff --cc requests/api.py
Simple merge