From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 5 Sep 2011 20:27:38 +0000 (-0400)
Subject: Merge branch 'feature/curl' into develop
X-Git-Tag: v0.8.0~94^2~112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd5a39731ae693eac9816f2ef5381bafbd7b58cb;p=services%2Fpython-requests.git

Merge branch 'feature/curl' into develop

Conflicts:
	AUTHORS
	HISTORY.rst
---

dd5a39731ae693eac9816f2ef5381bafbd7b58cb
diff --cc AUTHORS
index 8497a09,5a80c62..ceba487
--- a/AUTHORS
+++ b/AUTHORS
@@@ -42,4 -42,4 +42,5 @@@ Patches and Suggestion
  - Alejandro Giacometti
  - Rick Mak
  - Johan Bergström
 +- Josselin Jacquard
+ - Mike Waldner