Merge branch 'master' of git://github.com/kennethreitz/requests
authorsprt <hellosprt@gmail.com>
Thu, 24 Jan 2013 17:36:53 +0000 (18:36 +0100)
committersprt <hellosprt@gmail.com>
Thu, 24 Jan 2013 17:36:53 +0000 (18:36 +0100)
commitab2e7df8a9117a2839ec0f88eca57b564b1b02a2
tree3b8ba30961592000c9a9a73b41d8452c871f47b4
parent1cfe59299b1f81a070704a6a519f1329b4393a7a
parentbeec48c8f80b14514c2f335db53b185251ee6335
Merge branch 'master' of git://github.com/kennethreitz/requests

Conflicts:
test_requests.py
requests/models.py
test_requests.py