From: Kenneth Reitz <me@kennethreitz.com>
Date: Wed, 8 Jan 2014 18:53:23 +0000 (-0500)
Subject: Merge branch 'master' into fix-pickling-adapters
X-Git-Tag: v2.2.0~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df1c2335c82165b961b8a0361d0176cdb298e513;p=services%2Fpython-requests.git

Merge branch 'master' into fix-pickling-adapters

Conflicts:
	AUTHORS.rst
---

df1c2335c82165b961b8a0361d0176cdb298e513
diff --cc AUTHORS.rst
index 3b8504e,6e66844..b6cf9d0
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -145,4 -145,4 +145,5 @@@ Patches and Suggestion
  - Pengfei.X <pengphy@gmail.com>
  - Kamil Madac <kamil.madac@gmail.com>
  - Michael Becker <mike@beckerfuffle.com> @beckerfuffle
 -- Константин Подшумок @podshumok
 +- Erik Wickstrom <erik@erikwickstrom.com> @erikwickstrom
++- Константин Подшумок @podshumok