Skip to content

Commit

Permalink
[1.2.X] Corrected some alphabetization and dupe issues in the AUTHORS…
Browse files Browse the repository at this point in the history
… file.

Backport of r13586 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
freakboy3742 committed Aug 14, 2010
1 parent 8a006e1 commit e4a8b6c
Showing 1 changed file with 11 additions and 14 deletions.
25 changes: 11 additions & 14 deletions AUTHORS
Expand Up @@ -29,7 +29,6 @@ answer newbie questions, and generally made Django that much better:
Gisle Aas <gisle@aas.no> Gisle Aas <gisle@aas.no>
ajs <adi@sieker.info> ajs <adi@sieker.info>
alang@bright-green.com alang@bright-green.com
Alcides Fonseca
Andi Albrecht <albrecht.andi@gmail.com> Andi Albrecht <albrecht.andi@gmail.com>
Marty Alchin <gulopine@gamemusic.org> Marty Alchin <gulopine@gamemusic.org>
Ahmad Alhashemi <trans@ahmadh.com> Ahmad Alhashemi <trans@ahmadh.com>
Expand All @@ -39,7 +38,6 @@ answer newbie questions, and generally made Django that much better:
AgarFu <heaven@croasanaso.sytes.net> AgarFu <heaven@croasanaso.sytes.net>
Dagur Páll Ammendrup <dagurp@gmail.com> Dagur Páll Ammendrup <dagurp@gmail.com>
Collin Anderson <cmawebsite@gmail.com> Collin Anderson <cmawebsite@gmail.com>
Nicolas Lara <nicolaslara@gmail.com>
Jeff Anderson <jefferya@programmerq.net> Jeff Anderson <jefferya@programmerq.net>
Marian Andre <django@andre.sk> Marian Andre <django@andre.sk>
Andreas Andreas
Expand Down Expand Up @@ -85,19 +83,19 @@ answer newbie questions, and generally made Django that much better:
Sean Brant Sean Brant
Andrew Brehaut <http://brehaut.net/blog> Andrew Brehaut <http://brehaut.net/blog>
brut.alll@gmail.com brut.alll@gmail.com
bthomas
btoll@bestweb.net btoll@bestweb.net
Jonathan Buchanan <jonathan.buchanan@gmail.com> Jonathan Buchanan <jonathan.buchanan@gmail.com>
Keith Bussell <kbussell@gmail.com> Keith Bussell <kbussell@gmail.com>
C8E
Chris Cahoon <chris.cahoon@gmail.com> Chris Cahoon <chris.cahoon@gmail.com>
Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com> Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>
Trevor Caira <trevor@caira.com> Trevor Caira <trevor@caira.com>
Brett Cannon <brett@python.org> Brett Cannon <brett@python.org>
Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com> Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
Jeremy Carbaugh <jcarbaugh@gmail.com> Jeremy Carbaugh <jcarbaugh@gmail.com>
Carl Meyer <carl@dirtcircle.com>
Graham Carlyle <graham.carlyle@maplecroft.net> Graham Carlyle <graham.carlyle@maplecroft.net>
Antonio Cavedoni <http://cavedoni.com/> Antonio Cavedoni <http://cavedoni.com/>
C8E
cedric@terramater.net cedric@terramater.net
Chris Chamberlin <dja@cdc.msbx.net> Chris Chamberlin <dja@cdc.msbx.net>
Amit Chakradeo <http://amit.chakradeo.net/> Amit Chakradeo <http://amit.chakradeo.net/>
Expand Down Expand Up @@ -137,6 +135,7 @@ answer newbie questions, and generally made Django that much better:
Rajesh Dhawan <rajesh.dhawan@gmail.com> Rajesh Dhawan <rajesh.dhawan@gmail.com>
Sander Dijkhuis <sander.dijkhuis@gmail.com> Sander Dijkhuis <sander.dijkhuis@gmail.com>
Jordan Dimov <s3x3y1@gmail.com> Jordan Dimov <s3x3y1@gmail.com>
Nebojša Dorđević
dne@mayonnaise.net dne@mayonnaise.net
dready <wil@mojipage.com> dready <wil@mojipage.com>
Maximillian Dornseif <md@hudora.de> Maximillian Dornseif <md@hudora.de>
Expand Down Expand Up @@ -167,14 +166,14 @@ answer newbie questions, and generally made Django that much better:
Liang Feng <hutuworm@gmail.com> Liang Feng <hutuworm@gmail.com>
Bill Fenner <fenner@gmail.com> Bill Fenner <fenner@gmail.com>
Stefane Fermgier <sf@fermigier.com> Stefane Fermgier <sf@fermigier.com>
Afonso Fernández Nogueira <fonzzo.django@gmail.com>
J. Pablo Fernandez <pupeno@pupeno.com> J. Pablo Fernandez <pupeno@pupeno.com>
Maciej Fijalkowski Maciej Fijalkowski
Ben Firshman <ben@firshman.co.uk> Ben Firshman <ben@firshman.co.uk>
Matthew Flanagan <http://wadofstuff.blogspot.com> Matthew Flanagan <http://wadofstuff.blogspot.com>
Eric Floehr <eric@intellovations.com> Eric Floehr <eric@intellovations.com>
Eric Florenzano <floguy@gmail.com> Eric Florenzano <floguy@gmail.com>
Vincent Foley <vfoleybourgon@yahoo.ca> Vincent Foley <vfoleybourgon@yahoo.ca>
Alcides Fonseca
Rudolph Froger <rfroger@estrate.nl> Rudolph Froger <rfroger@estrate.nl>
Jorge Gajon <gajon@gajon.org> Jorge Gajon <gajon@gajon.org>
gandalf@owca.info gandalf@owca.info
Expand Down Expand Up @@ -275,11 +274,11 @@ answer newbie questions, and generally made Django that much better:
kurtiss@meetro.com kurtiss@meetro.com
Denis Kuzmichyov <kuzmichyov@gmail.com> Denis Kuzmichyov <kuzmichyov@gmail.com>
Panos Laganakos <panos.laganakos@gmail.com> Panos Laganakos <panos.laganakos@gmail.com>
Lakin Wecker <lakin@structuredabstraction.com>
Nick Lane <nick.lane.au@gmail.com> Nick Lane <nick.lane.au@gmail.com>
Stuart Langridge <http://www.kryogenix.org/> Stuart Langridge <http://www.kryogenix.org/>
Paul Lanier <planier@google.com> Paul Lanier <planier@google.com>
David Larlet <http://david.larlet.fr> David Larlet <http://david.larlet.fr>
Nicolas Lara <nicolaslara@gmail.com>
Nicola Larosa <nico@teknico.net> Nicola Larosa <nico@teknico.net>
Finn Gruwier Larsen <finn@gruwier.dk> Finn Gruwier Larsen <finn@gruwier.dk>
Lau Bech Lauritzen Lau Bech Lauritzen
Expand All @@ -300,7 +299,6 @@ answer newbie questions, and generally made Django that much better:
Simon Litchfield <simon@quo.com.au> Simon Litchfield <simon@quo.com.au>
Daniel Lindsley <polarcowz@gmail.com> Daniel Lindsley <polarcowz@gmail.com>
Trey Long <trey@ktrl.com> Trey Long <trey@ktrl.com>
msaelices <msaelices@gmail.com>
Martin Mahner <http://www.mahner.org/> Martin Mahner <http://www.mahner.org/>
Matt McClanahan <http://mmcc.cx/> Matt McClanahan <http://mmcc.cx/>
Stanislaus Madueke Stanislaus Madueke
Expand All @@ -313,20 +311,21 @@ answer newbie questions, and generally made Django that much better:
Petr Marhoun <petr.marhoun@gmail.com> Petr Marhoun <petr.marhoun@gmail.com>
Petar Marić <http://www.petarmaric.com/> Petar Marić <http://www.petarmaric.com/>
Nuno Mariz <nmariz@gmail.com> Nuno Mariz <nmariz@gmail.com>
Marijn Vriens <marijn@metronomo.cl>
mark@junklight.com mark@junklight.com
Orestis Markou <orestis@orestis.gr> Orestis Markou <orestis@orestis.gr>
Takashi Matsuo <matsuo.takashi@gmail.com> Takashi Matsuo <matsuo.takashi@gmail.com>
Yasushi Masuda <whosaysni@gmail.com> Yasushi Masuda <whosaysni@gmail.com>
mattycakes@gmail.com mattycakes@gmail.com
Glenn Maynard <glenn@zewt.org>
Jason McBrayer <http://www.carcosa.net/jason/> Jason McBrayer <http://www.carcosa.net/jason/>
Kevin McConnell <kevin.mcconnell@gmail.com> Kevin McConnell <kevin.mcconnell@gmail.com>
mccutchen@gmail.com mccutchen@gmail.com
michael.mcewan@gmail.com
Paul McLanahan <paul@mclanahan.net> Paul McLanahan <paul@mclanahan.net>
Tobias McNulty <http://www.caktusgroup.com/blog> Tobias McNulty <http://www.caktusgroup.com/blog>
Zain Memon Zain Memon
Christian Metts Christian Metts
michael.mcewan@gmail.com Carl Meyer <carl@dirtcircle.com>
michal@plovarna.cz michal@plovarna.cz
Slawek Mikula <slawek dot mikula at gmail dot com> Slawek Mikula <slawek dot mikula at gmail dot com>
mitakummaa@gmail.com mitakummaa@gmail.com
Expand All @@ -336,13 +335,13 @@ answer newbie questions, and generally made Django that much better:
Aljosa Mohorovic <aljosa.mohorovic@gmail.com> Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
Ramiro Morales <rm0@gmx.net> Ramiro Morales <rm0@gmx.net>
Eric Moritz <http://eric.themoritzfamily.com/> Eric Moritz <http://eric.themoritzfamily.com/>
msaelices <msaelices@gmail.com>
Gregor Müllegger <gregor@muellegger.de> Gregor Müllegger <gregor@muellegger.de>
Robin Munn <http://www.geekforgod.com/> Robin Munn <http://www.geekforgod.com/>
James Murty James Murty
msundstr msundstr
Robert Myers <myer0052@gmail.com> Robert Myers <myer0052@gmail.com>
Alexander Myodov <alex@myodov.com> Alexander Myodov <alex@myodov.com>
Nebojša Dorđević
Doug Napoleone <doug@dougma.com> Doug Napoleone <doug@dougma.com>
Gopal Narayanan <gopastro@gmail.com> Gopal Narayanan <gopastro@gmail.com>
Fraser Nevett <mail@nevett.org> Fraser Nevett <mail@nevett.org>
Expand Down Expand Up @@ -370,7 +369,6 @@ answer newbie questions, and generally made Django that much better:
phil.h.smith@gmail.com phil.h.smith@gmail.com
Gustavo Picon Gustavo Picon
Michael Placentra II <someone@michaelplacentra2.net> Michael Placentra II <someone@michaelplacentra2.net>
Luke Plant <http://lukeplant.me.uk/>
plisk plisk
Daniel Poelzleithner <http://poelzi.org/> Daniel Poelzleithner <http://poelzi.org/>
polpak@yahoo.com polpak@yahoo.com
Expand Down Expand Up @@ -401,7 +399,6 @@ answer newbie questions, and generally made Django that much better:
Henrique Romano <onaiort@gmail.com> Henrique Romano <onaiort@gmail.com>
Armin Ronacher Armin Ronacher
Daniel Roseman <http://roseman.org.uk/> Daniel Roseman <http://roseman.org.uk/>
Brian Rosner <brosner@gmail.com>
Rozza <ross.lawley@gmail.com> Rozza <ross.lawley@gmail.com>
Oliver Rutherfurd <http://rutherfurd.net/> Oliver Rutherfurd <http://rutherfurd.net/>
ryankanno ryankanno
Expand Down Expand Up @@ -480,6 +477,7 @@ answer newbie questions, and generally made Django that much better:
George Vilches <gav@thataddress.com> George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org> Vlado <vlado@labath.org>
Zachary Voase <zacharyvoase@gmail.com> Zachary Voase <zacharyvoase@gmail.com>
Marijn Vriens <marijn@metronomo.cl>
Milton Waddams Milton Waddams
Chris Wagner <cw264701@ohio.edu> Chris Wagner <cw264701@ohio.edu>
Rick Wagner <rwagner@physics.ucsd.edu> Rick Wagner <rwagner@physics.ucsd.edu>
Expand All @@ -488,6 +486,7 @@ answer newbie questions, and generally made Django that much better:
Filip Wasilewski <filip.wasilewski@gmail.com> Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/> Dan Watson <http://theidioteque.net/>
Joel Watts <joel@joelwatts.com> Joel Watts <joel@joelwatts.com>
Lakin Wecker <lakin@structuredabstraction.com>
Chris Wesseling <Chris.Wesseling@cwi.nl> Chris Wesseling <Chris.Wesseling@cwi.nl>
James Wheare <django@sparemint.com> James Wheare <django@sparemint.com>
Mike Wiacek <mjwiacek@google.com> Mike Wiacek <mjwiacek@google.com>
Expand All @@ -509,8 +508,6 @@ answer newbie questions, and generally made Django that much better:
Gasper Zejn <zejn@kiberpipa.org> Gasper Zejn <zejn@kiberpipa.org>
Jarek Zgoda <jarek.zgoda@gmail.com> Jarek Zgoda <jarek.zgoda@gmail.com>
Cheng Zhang Cheng Zhang
Glenn Maynard <glenn@zewt.org>
bthomas


A big THANK YOU goes to: A big THANK YOU goes to:


Expand Down

0 comments on commit e4a8b6c

Please sign in to comment.