From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 16 Aug 2011 06:34:44 +0000 (-0400)
Subject: Merge branch 'feature/session' of https://github.com/tomhsx/requests into feature... 
X-Git-Tag: v0.6.0~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fa021582b8b12b7072dee4b641906574ba80087;p=services%2Fpython-requests.git

Merge branch 'feature/session' of https://github.com/tomhsx/requests into feature/session

Conflicts:
	AUTHORS
---

2fa021582b8b12b7072dee4b641906574ba80087
diff --cc AUTHORS
index ccb95e2,acaa758..6d2d196
--- a/AUTHORS
+++ b/AUTHORS
@@@ -32,5 -32,4 +32,6 @@@ Patches and Suggestion
  - Rubén Abad
  - Peter Manser
  - Jeremy Selie
 +- Jens Diemer
- - Alex <@alopatin>
++- Alex <@alopatin>
+ - Tom Hogans <tomhsx@gmail.com>