Merge branch 'feature/curl' into develop

author Kenneth Reitz <me@kennethreitz.com>

Mon, 5 Sep 2011 20:27:38 +0000 (16:27 -0400)

committer Kenneth Reitz <me@kennethreitz.com>

Mon, 5 Sep 2011 20:27:38 +0000 (16:27 -0400)
author Kenneth Reitz <me@kennethreitz.com>
Mon, 5 Sep 2011 20:27:38 +0000 (16:27 -0400)
committer Kenneth Reitz <me@kennethreitz.com>
Mon, 5 Sep 2011 20:27:38 +0000 (16:27 -0400)
diff --cc AUTHORS

index 8497a09cebad5ce253d75c528c20d25d7d162fbd,5a80c622c76d25a168258d76b1cdc9247e33434a..ceba48735e0cdb692e482fcefbac7731b2a36049
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -42,4 -42,4 +42,5 @@@ Patches and Suggestion
   - Alejandro Giacometti
   - Rick Mak
   - Johan Bergström
+ +- Josselin Jacquard
+ - Mike Waldner
diff --cc requests/utils.py
Simple merge
diff --cc test_requests.py
Simple merge
author	Kenneth Reitz <me@kennethreitz.com>
	Mon, 5 Sep 2011 20:27:38 +0000 (16:27 -0400)
committer	Kenneth Reitz <me@kennethreitz.com>
	Mon, 5 Sep 2011 20:27:38 +0000 (16:27 -0400)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
requests/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
test_requests.py	patch \|	diff1 \|	diff2 \|	blob \| history