From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 22 Dec 2011 16:55:13 +0000 (-0500)
Subject: Merge branch 'develop' of https://github.com/atdt/requests into develop
X-Git-Tag: v0.8.7~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d88ac7b50f05b1196672ba7df88d2321c2d6ee0;p=services%2Fpython-requests.git

Merge branch 'develop' of https://github.com/atdt/requests into develop

Conflicts:
	AUTHORS.rst
---

9d88ac7b50f05b1196672ba7df88d2321c2d6ee0
diff --cc AUTHORS.rst
index 0715f2d,bf61d06..b9c3a64
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -66,4 -66,4 +66,5 @@@ Patches and Suggestion
  - Ed Summers
  - Chris Van Horne
  - Christopher Davis
 -- Jason Emerick
 +- Ori Livneh
++- Jason Emerick