Kenneth Reitz 9f55f503b1 merge conflict and fixes for python3

2012-03-09 08:43:12 -08:00

..

test_requests_async.py

…

test_requests_ext.py

merge conflict and fixes for python3

2012-03-09 08:43:12 -08:00

test_requests.py

Merge remote-tracking branch 'origin/develop' into develop

2012-03-09 08:07:17 -08:00