authors

diff --git a/AUTHORS.orig b/AUTHORS.orig
new file mode 100644 (file)
index 0000000..dd88224
--- /dev/null
+++ b/AUTHORS.orig
@@ -0,0 +1,40 @@
+Requests is written and maintained by Kenneth Reitz and
+various contributors:
+
+Development Lead
+````````````````
+
+- Kenneth Reitz <me@kennethreitz.com>
+
+
+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 <miguel@moliware.com>
+- 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 <tomhsx@gmail.com>
+>>>>>>> 0ed641a26ec2200de00e4bbf3d170c767375351e