From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 12 Jul 2012 19:06:43 +0000 (-0700)
Subject: Merge branch 'develop' of git://github.com/siebenschlaefer/requests into develop
X-Git-Tag: v0.13.3~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b222ff94777c6370d1ab15fe77b2cc7d4e90a8d8;p=services%2Fpython-requests.git

Merge branch 'develop' of git://github.com/siebenschlaefer/requests into develop

Conflicts:
	AUTHORS.rst
---

b222ff94777c6370d1ab15fe77b2cc7d4e90a8d8
diff --cc AUTHORS.rst
index b1e8ec2,915826a..1ff5314
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -105,7 -105,4 +105,8 @@@ Patches and Suggestion
  - Danilo Bargen (gwrtheyrn)
  - Torsten Landschoff
  - Michael Holler (apotheos)
 +- Timnit Gebru
 +- Sarah Gonzalez
 +- Victoria Mo
 +- Leila Muhtasib
+ - Matthias Rahlf <matthias@webding.de>