From: Kenneth Reitz Date: Sat, 20 Aug 2011 22:34:33 +0000 (-0400) Subject: merge remnant (oops) X-Git-Tag: v0.6.4^2~5^2~5^2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bfa909ff2bcf8b51f19a5d612f82301f9afce3f;p=services%2Fpython-requests.git merge remnant (oops) --- diff --git a/AUTHORS.orig b/AUTHORS.orig deleted file mode 100644 index dd88224..0000000 --- a/AUTHORS.orig +++ /dev/null @@ -1,40 +0,0 @@ -Requests is written and maintained by Kenneth Reitz and -various contributors: - -Development Lead -```````````````` - -- Kenneth Reitz - - -Patches and Suggestions -``````````````````````` - -- Various Pocoo Members -- Chris Adams -- Flavio Percoco Premoli -- Dj Gilcrease -- Justin Murphy -- Rob Madole -- Aram Dulyan -- Johannes Gorset -- 村山めがね (Megane Murayama) -- James Rowe -- Daniel Schauenberg -- Zbigniew Siciarz -- Daniele Tricoli 'Eriol' -- Richard Boulton -- Miguel Olivares -- Alberto Paro -- Jérémy Bethmont -- 潘旭 (Xu Pan) -- Tamás Gulácsi -- Rubén Abad -- Peter Manser -- Jeremy Selie -<<<<<<< HEAD -- Jens Diemer -- Alex <@alopatin> -======= -- Tom Hogans ->>>>>>> 0ed641a26ec2200de00e4bbf3d170c767375351e