Convert CREDITS to single list of contributors

Merge the "developers" and "patch contributors" lists into a single list
of "contributors".

Bug: T139300
Change-Id: I44a49b3e0231c767bc41cd8bf8d68e28944b5cce

1 files changed, 94 insertions, 95 deletions

diff --git a/CREDITS b/CREDITS
index 46d5c9ca0bf4..30ebc9ee10bb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -6,159 +6,111 @@ following names for their contribution to the product.
 -->
 <!-- Please notice that the following can be found parsed under Special:Version/Credits -->
 
-== Developers ==
-* Aaron Schulz
-* Alex Z.
-* Alexander Monk
-* Alexandre Emsenhuber
-* Andrew Garrett
-* Antoine Musso
-* Arthur Richards
-* Aryeh Gregor
-* Bartosz Dziewoński
-* Bertrand Grondin
-* Brad Jorsch
-* Brian Wolff
-* Brion Vibber
-* Bryan Davis
-* Bryan Tong Minh
-* Chad Horohoe
-* Charles Melbye
-* Chris Steipp
-* church of emacs
-* Daniel Friesen
-* Daniel Kinzler
-* Daniel Renfro
-* Danny B.
-* David McCabe
-* Derk-Jan Hartman
-* Domas Mituzas
-* Ed Sanders
-* Emufarmers
-* Fran Rogers
-* Greg Sabino Mullane
-* Guy Van den Broeck
-* Happy-melon
-* Hojjat
-* Ian Baker
-* Ilmari Karonen
-* Jack D. Pond
-* Jack Phoenix
-* Jackmcbarn
-* James Forrester
-* Jan Paul Posma
-* Jason Richey
-* Jeroen De Dauw
-* John Du Hart
-* Jon Harald Søby
-* Juliano F. Ravasi
-* JuneHyeon Bae
-* Leo Koppelkamm
-* Leon Weber
-* Leslie Hoare
-* Marco Schuster
-* Marius Hoch
-* Matěj Grabovský
-* Matt Johnston
-* Matthew Flaschen
-* Max Semenik
-* Meno25
-* MinuteElectron
-* Mohamed Magdy
-* Nathaniel Herman
-* Neil Kandalgaonkar
-* Nicolas Dumazet
-* Niklas Laxström
-* Ori Livneh
-* Patrick Reilly
-* Philip Tzou
-* Platonides
-* Purodha Blissenbach
-* Raimond Spekking
-* Remember the dot
-* Roan Kattouw
-* Robert Stojnić
-* Robin Pepermans
-* Rotem Liss
-* Ryan Kaldari
-* Ryan Lane
-* Ryan Schmidt
-* Sam Reed
-* Shinjiman
-* Siebrand Mazeland
-* Soxred93
-* SQL
-* Szymon Świerkosz
-* This, that and the other
-* Thomas Bleher
-* Thomas Gries
-* Tim Starling
-* Timo Tijhof
-* Trevor Parscal
-* Tyler Anthony Romeo
-* Victor Vasiliev
-* Yesid Carrillo
-* Yuri Astrakhan
-
-== Patch Contributors ==
+== Contributors ==
+<!-- BEGIN CONTRIBUTOR LIST -->
 * Aaron Ball
 * Aaron Pramana
+* Aaron Schulz
 * Agbad
 * Ahmad Sherif
 * Alejandro Mery
+* Alex Z.
+* Alexander Monk
+* Alexandre Emsenhuber
 * Amalthea
 * Amir E. Aharoni
 * Andrew Dunbar
+* Andrew Garrett
+* Antoine Musso
 * Antonio Ospite
+* Arthur Richards
+* Aryeh Gregor
 * Asier Lostalé
 * Azliq7
 * Bagariavivek
+* Bartosz Dziewoński
 * Beau
 * Benny Situ
 * Bergi
+* Bertrand Grondin
 * Borislav Manolov
+* Brad Jorsch
 * Brent G
+* Brian Wolff
 * Brianna Laugher
+* Brion Vibber
+* Bryan Davis
+* Bryan Tong Minh
 * Carlin
 * Carsten Nielsen
+* Chad Horohoe
+* Charles Melbye
+* Chris Steipp
 * Christian Aistleitner
 * Christian Neubauer
+* church of emacs
 * Conrad Irwin
 * cryptocoryne
 * Dan Barrett
 * Dan Collins
 * Dan Nessett
 * Daniel Arnold
+* Daniel Friesen
+* Daniel Kinzler
+* Daniel Renfro
 * Daniel Werner
+* Danny B.
 * David Baumgarten
+* David McCabe
 * Denny Vrandecic
+* Derk-Jan Hartman
 * Dévai Tamás
+* Domas Mituzas
 * Ebrahim Byagowi
 * Edward Z. Yang
 * Elvis Stansvik
+* Emufarmers
 * Eranroz
 * Erwin Dokter
 * Étienne Beaulé
 * Federico Leva
 * Florian Schmidt
 * fomafix
+* Fran Rogers
 * FunPika
 * Gabriel Wicke
 * Geoffrey Mon
 * Gero Scholz
 * Gilles van den Hoven
+* Greg Sabino Mullane
 * Grunny
+* Guy Van den Broeck
+* Happy-melon
 * Harry Burt
+* Hojjat
+* Ian Baker
+* Ilmari Karonen
 * Ireas
+* Jack D. Pond
+* Jack Phoenix
+* Jackmcbarn
 * Jacob Block
+* James Forrester
 * Jan Gerber
 * Jan Luca Naumann
+* Jan Paul Posma
 * Jaska Zedlik
+* Jason Richey
 * Jeremy Baron
+* Jeroen De Dauw
 * Jidanni
 * Jimmy Xu
+* John Du Hart
 * John N
+* Jon Harald Søby
 * Jonathan Wiltshire
+* Juliano F. Ravasi
+* JuneHyeon Bae
 * Jure Kajzer
 * Karun Dambiec
 * Katie Filbert
@@ -166,7 +118,10 @@ following names for their contribution to the product.
 * Kim Hyun-Joon
 * Lee Worden
 * Lejonel
+* Leo Koppelkamm
 * Leon Liesener
+* Leon Weber
+* Leslie Hoare
 * liangent
 * Louperivois
 * Lucas Garczewski
@@ -177,16 +132,23 @@ following names for their contribution to the product.
 * Manuel Menal
 * Marc-André Pelletier
 * Marcin Cieślak
+* Marco Schuster
 * Marcus Buck
+* Marius Hoch
 * Mark Hershberger
 * Mark Holmquist
 * Marooned
+* Matěj Grabovský
 * Mathias Ertl
 * mati
+* Matt Johnston
 * Matthew Britton
+* Matthew Flaschen
 * Matthias Mullie
 * Max
+* Max Semenik
 * Max Sikström
+* Meno25
 * merl
 * Michael Dale
 * Michael De La Rue
@@ -194,7 +156,9 @@ following names for their contribution to the product.
 * Michael Newton
 * Michael Walsh
 * Mike Horvath
+* MinuteElectron
 * moejoe0000
+* Mohamed Magdy
 * Mormegil
 * MrBlueSky
 * MrPete
@@ -202,56 +166,91 @@ following names for their contribution to the product.
 * MZMcBride
 * Nakon
 * Nathan Larson
+* Nathaniel Herman
+* Neil Kandalgaonkar
 * nephele
+* Nicolas Dumazet
 * Nik
+* Niklas Laxström
 * Nikola Kovacs
 * Nikolaos S. Karastathis
 * Nischay Nahata
 * Nx.devnull
 * Olaf Lenz
 * Olivier Finlay Beaton
+* Ori Livneh
 * Patricio Molina
+* Patrick Reilly
 * Paul Copperman
 * Paul Oranje
 * Peter Gehres
 * Petr Onderka
+* Philip Tzou
 * PieRRoMaN
+* Platonides
+* Purodha Blissenbach
 * quietust
+* Raimond Spekking
+* Remember the dot
 * René Kijewski
 * rgcjonas
+* Roan Kattouw
 * Rob Moen
+* Robert Stojnić
 * Robert Treat
+* Robin Pepermans
 * RockMFR
+* Rotem Liss
 * Russell Blau
 * Rusty Burchfield
+* Ryan Kaldari
+* Ryan Lane
+* Ryan Schmidt
 * S Page
 * Salvatore Ingala
+* Sam Reed
 * Santhosh Thottingal
 * Scott Colcord
 * se4598
 * Sébastien Santoro
+* Shinjiman
+* Siebrand Mazeland
 * Simon Walker
 * Solitarius
 * Søren Løvborg
 * Southparkfan
+* Soxred93
+* SQL
 * Srikanth Lakshmanan
 * Stefano Codari
 * Str4nd
 * Subramanya Sastry
 * svip
+* Szymon Świerkosz
 * The Evil IP address
+* This, that and the other
+* Thomas Bleher
+* Thomas Gries
 * Tim Landscheidt
+* Tim Starling
+* Timo Tijhof
 * Tisane
+* Trevor Parscal
+* Tyler Anthony Romeo
 * Umherirrender
 * Van de Bugger
+* Victor Vasiliev
 * Ville Stadista
 * Vitaliy Filippov
 * Vivek Ghaisas
 * Waldir Pimenta
 * William Demchick
+* Yesid Carrillo
+* Yuri Astrakhan
 * Yusuke Matsubara
 * Yuvi Panda
 * Zachary Hauri
+<!-- END CONTRIBUTOR LIST -->
 
 == Translators ==