Merge branch 'feature/session' of https://github.com/tomhsx/requests into feature...
authorKenneth Reitz <me@kennethreitz.com>
Tue, 16 Aug 2011 06:34:44 +0000 (02:34 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Tue, 16 Aug 2011 06:34:44 +0000 (02:34 -0400)
Conflicts:
AUTHORS

1  2 
AUTHORS

diff --cc AUTHORS
index ccb95e24047f7e4a99271760f664253a1403ed79,acaa758334c1f18d9364616f53944c26687d17e6..6d2d1965892fcc963c5dc016e3e6e836e5054709
+++ b/AUTHORS
@@@ -32,5 -32,4 +32,6 @@@ Patches and Suggestion
  - RubĂ©n Abad
  - Peter Manser
  - Jeremy Selie
- - Alex <@alopatin>
 +- Jens Diemer
++- Alex <@alopatin>
+ - Tom Hogans <tomhsx@gmail.com>