From 57734f3cda29e4d3c96d319f95df38dc318755b3 Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Mon, 25 Jun 2018 18:27:01 +0200
Subject: [PATCH] Update contributors list.

Also update the self-contained script to use official overrides from
mailmap files.
---
 CONTRIBUTORS.rst | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index c898628ea..d43487b68 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -2,7 +2,7 @@
  names () 
  { 
  echo -e "\n exit;\n**Contributors (sorted by number of commits):**\n";
- git log --format='%aN:%ae' origin/master | grep -Ev "(anonymous:|FYG_.*_bot_ignore_me)" | sed 's/@users.github.com/@users.noreply.github.com/g' | awk 'BEGIN{FS=":"}{match ($1, /^(%)?(.*)/, n) ; ct[n[2]]+=1; if (n[1] ~ /%/ || e[n[2]] == "" ) { e[n[2]]=$2}}END{for (i in e) { n[i]=e[i];c[i]+=ct[i] }; for (a in e) print c[a]"\t* "a" <"n[a]">";}' | sort -n -r | cut -f 2-
+ git log --format='%aN:%aE' origin/master | grep -Ev "(anonymous:|FYG_.*_bot_ignore_me)" | sed 's/@users.github.com/@users.noreply.github.com/g' | awk 'BEGIN{FS=":"}{ct[$1]+=1;e[$1]=$2}END{for (i in e)  { n[i]=e[i];c[i]+=ct[i] }; for (a in e) print c[a]"\t* "a" <"n[a]">";}' | sort -n -r | cut -f 2-
  }
  quine () 
  { 
@@ -28,30 +28,36 @@
 * João Paulo Barraca <jpbarraca@gmail.com>
 * Jonas <jonasdcdm@posteo.net>
 * Yaron Shahrabani <sh.yaron@gmail.com>
-* protomors <protomors@gmail.com>
 * postsorino <postsorino@krutt.org>
-* ivanovlev <lion.ivanov@gmal.com>
-* mueller-ma <matthias_mueller_lgz@t-online.de>
+* protomors <protomors@gmail.com>
 * Allan Nordhøy <epost@anotheragency.no>
-* Julien Pivotto <roidelapluie@inuits.eu>
+* mueller-ma <mueller-ma@users.noreply.github.com>
+* ivanovlev <ivanovlev@mail.ru>
+* naofum <naofum@gmail.com>
 * youzhiran <2668760098@qq.com>
+* Tijl Schepens <tijl.schepens@hotmail.com>
+* TaaviE <taavi.eomae+weblate@gmail.com>
+* Julien Pivotto <roidelapluie@inuits.eu>
+* Taavi Eomäe <taavi.eomae+github@gmail.com>
 * Steffen Liebergeld <perl@gmx.org>
 * Lem Dulfo <lemuel.dulfo@gmail.com>
-* naofum <naofum@gmail.com>
+* Hadrián Candela <hadrian.candela@gmail.com>
 * Felix Konstantin Maurer <maufl@maufl.de>
 * Sergey Trofimov <sarg@sarg.org.ru>
+* Robert Barat <rbarat07@gmail.com>
 * José Rebelo <joserebelo@outlook.com>
 * JohnnySun <bmy001@gmail.com>
-* Hadrián Candela <hadrian.candela@gmail.com>
 * Uwe Hermann <uwe@hermann-uwe.de>
-* TaaviE <taavi.eomae+weblate@gmail.com>
+* Edoardo Rosa <edoardo.rosa90@gmail.com>
 * Alberto <albertsal83@gmail.com>
 * Vladislav Serkov <vladserkoff@protonmail.com>
 * Vebryn <vebryn@gmail.com>
+* Gilles Émilien MOREL <contact@gilles-morel.fr>
 * Gergely Peidl <gergely@peidl.net>
 * Bożydar <trening302@o2.pl>
 * 0nse <0nse@users.noreply.github.com>
-* Tijl Schepens <tijl.schepens@hotmail.com>
+* Максим Якимчук <xpinovo@gmail.com>
+* Rimas Raguliūnas <rarimas@gmail.com>
 * masakoodaa <masakoodaa@protonmail.com>
 * Lukas Veneziano <fs@venezilu.de>
 * Kompact <joaorafael123@hotmail.com>
@@ -61,14 +67,17 @@
 * 6arms1leg <m.brnsfld@googlemail.com>
 * Zhong Jianxin <azuwis@gmail.com>
 * walkjivefly <mark@walkjivefly.com>
+* Ted Stein <me@tedstein.net>
+* NotAFIle <nota@notafile.com>
 * Normano64 <per.bergqwist@gmail.com>
+* NicoBuntu <nicolas__du95@hotmail.fr>
 * nautilusx <mail.ka@mailbox.org>
 * Minori Hiraoka (미노리) <minori@mnetwork.co.kr>
 * Michal Novotny <mignov@gmail.com>
 * mesnevi <shams@airpost.net>
 * LL <lu.lecocq@free.fr>
 * Jesús <zaagur@gmail.com>
-* Gilles Émilien MOREL <contact@gilles-morel.fr>
+* exit-failure <hakrala@web.de>
 * Avamander <Avamander@users.noreply.github.com>
 * AnthonyDiGirolamo <anthony.digirolamo@gmail.com>
 * Andreas Kromke <Andreas.Kromke@web.de>
@@ -79,9 +88,10 @@
 * Vitaliy Shuruta <vshuruta@gmail.com>
 * Tomer Rosenfeld <tomerosenfeld007@gmail.com>
 * Tomas Radej <tradej@redhat.com>
-* Ted Stein <me@tedstein.net>
+* tiparega <11555126+tiparega@users.noreply.github.com>
 * Tarik Sekmen <tarik@ilixi.org>
 * Szymon Tomasz Stefanek <s.stefanek@gmail.com>
+* Sergio Lopez <slp@sinrega.org>
 * Sami Alaoui <4ndroidgeek@gmail.com>
 * Roman Plevka <rplevka@redhat.com>
 * rober <rober@prtl.nodomain.net>
@@ -90,26 +100,32 @@
 * Pavel Motyrev <legioner.r@gmail.com>
 * Pascal <pascal.tannich@gmail.com>
 * Olexandr Nesterenko <olexn@ukr.net>
-* NotAFIle <nota@notafile.com>
-* NotAFile <notafile@gmail.com>
 * Nicolò Balzarotti <anothersms@gmail.com>
 * Natanael Arndt <arndtn@gmail.com>
+* Moarc <aldwulf@gmail.com>
 * Michal Novak <michal.novak@post.cz>
 * michaelneu <git@michaeln.eu>
 * McSym28 <McSym28@users.noreply.github.com>
 * MaxL <z60loa8qw3umzu3@my10minutemail.com>
+* Martin <ritualz@users.noreply.github.com>
+* Martin Piatka <chachacha2323@gmail.com>
 * Marc Schlaich <marc.schlaich@googlemail.com>
+* Manuel Soler <vg8020@gmail.com>
+* Luiz Felipe das Neves Lopes <androidfelipe23@gmail.com>
 * Leonardo Amaral <contato@leonardoamaral.com.br>
 * lazarosfs <lazarosfs@csd.auth.gr>
 * ladbsoft <30509719+ladbsoft@users.noreply.github.com>
+* Kristjan Räts <kristjanrats@gmail.com>
 * kevlarcade <kevlarcade@gmail.com>
 * Kevin Richter <me@kevinrichter.nl>
 * Kaz Wolfe <root@kazwolfe.io>
 * Kasha <kasha_malaga@hotmail.com>
 * Joseph Kim <official.jkim@gmail.com>
 * Jan Lolek <janlolek@seznam.cz>
+* Jakub Jelínek <jakub.jelinek@gmail.com>
 * Ivan <ivan_tizhanin@mail.ru>
 * Hasan Ammar <ammarh@gmail.com>
+* Gilles MOREL <contact@gilles-morel.fr>
 * Gideão Gomes Ferreira <trjctr@gmail.com>
 * Gabe Schrecker <gabe@pbrb.co.uk>
 * freezed-or-frozen <freezed.or.frozen@gmail.com>
@@ -118,11 +134,14 @@
 * Daniel Hauck <maill@dhauck.eu>
 * criogenic <criogenic@gmail.com>
 * Chris Perelstein <chris.perelstein@gmail.com>
+* chabotsi <chabotsi+github@chabotsi.fr>
 * Carlos Ferreira <calbertoferreira@gmail.com>
 * bucala <marcel.bucala@gmail.com>
 * batataspt@gmail.com <batataspt@gmail.com>
 * atkyritsis <at.kyritsis@gmail.com>
+* AndrewH <36428679+andrewheadricke@users.noreply.github.com>
 * andre <andre.buesgen@yahoo.de>
+* Allen B <28495335+Allen-B1@users.noreply.github.com>
 * Alexey Afanasev <avafanasiev@gmail.com>
 
 And all the Transifex translators, which I cannot automatically list, at the moment.