Merge remote-tracking branch 'cweb/master'

1 files changed, 82 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..304e14a2
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,82 @@
+=========
+ AUTHORS
+=========
+
+This is a list of contributors to MediaGoblin.  They contribute in a
+variety of different ways and this software wouldn't exist without them.
+
+Thank you!
+
+* Aaron Williamson
+* Aditi Mittal
+* Aeva Ntsc
+* Alejandro Villanueva
+* Aleksandar Micovic
+* Aleksej Serdjukov
+* Alon Levy
+* Alex Camelio
+* András Veres-Szentkirályi
+* Bassam Kurdali
+* Bernhard Keller
+* Brett Smith
+* Caleb Forbes Davis V
+* Corey Farwell
+* Chris Moylan
+* Christopher Allan Webber
+* David Thompson
+* Daniel Neel
+* Deb Nicholson
+* Derek Moore
+* Duncan Paterson
+* Elrond of Samba TNG
+* Emily O'Leary
+* Gabi Thume
+* Gabriel Saldana
+* Greg Grossmeier
+* Hans Lo
+* Jakob Kramer
+* Jef van Schendel
+* Jessica Tallon
+* Jim Campbell
+* Joar Wandborg
+* Jorge Araya Navarro
+* Karen Rustad
+* Kuno Woudt
+* Laura Arjona
+* Larisa Hoffenbecker
+* Luke Slater
+* Manuel Urbano Santos
+* Mark Holmquist
+* Mats Sjöberg
+* Matt Lee
+* Michele Azzolari
+* Mike Linksvayer
+* Natalie Foust-Pilcher
+* Nathan Yergler
+* Odin Hørthe Omdal
+* Osama Khalid
+* Pablo J. Urbano Santos
+* Praveen Kumar
+* Rasmus Larsson
+* Rodney Ewing
+* Runar Petursson
+* Sacha De'Angeli
+* Sam Kleinman
+* Sam Tuke
+* Sebastian Spaeth
+* Shawn Khan
+* Simon Fondrie-Teitler
+* Stefano Zacchiroli
+* Tiberiu C. Turbureanu
+* Tran Thanh Bao
+* Tryggvi Björgvinsson
+* Shawn Khan
+* Will Kahn-Greene
+
+If you think your name should be on this list, let us know!
+
+
+We also are currently borrowing an image in
+mediagoblin/static/images/media_thumbs/image.png from the wonderful
+people at http://tango.freedesktop.org/ which is in the public
+domain... thanks Tango folks!