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)
commit98c5ded4f3a40c41d56f3bd4af13b20cf949da01
treef7bf33178dcfc1aff40e1ce20667cecceb53f22e
parent5568f77ad5005ae623eba85567d12e01cd6f4500
parentc05202939910d6b58a680601f75656403700c4c5
Merge branch 'master' into develop
requests/api.py