From c5fad05ef78e2772d765c3ed01a1f32ffbc21228 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 18 Apr 2018 02:05:33 +0100
Subject: [PATCH] Update CREDITS and .mailmap

Before this change, running the script would add the following:

* Cicalese: Duplicate. Fixed by adding another address to mailmap.
  Follows-up 3b55b0b3b8.

* gopavasanth: Added.

* Guycn2: Added.

* Zoranzoki21: Duplicate. Fixed by normalising their name via mailmap.

Also, remove the following added by 19ccff96086b70b:

* GeoffreyT2000: Duplicate. Already normalised by mailmap.

Change-Id: I5b11444a74dad090e484c2e256d32de5f6792943
---
 .mailmap | 2 ++
 CREDITS  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 77d2b8dd3d..6c316171bd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -109,6 +109,7 @@ Christopher Johnson <root@bugzilla.wmde.de>
 church of emacs <churchofemacs@users.mediawiki.org>
 Cindy Cicalese <ccicalese@wikimedia.org>
 Cindy Cicalese <ccicalese@wikimedia.org> <cicalese@mitre.org>
+Cindy Cicalese <ccicalese@wikimedia.org> <cindom@gmail.com>
 ckoerner <nobelx@gmail.com>
 Conrad Irwin <conrad.irwin+wiki@gmail.com> <conrad@users.mediawiki.org>
 Dan Duvall <dduvall@wikimedia.org>
@@ -474,6 +475,7 @@ Yuvi Panda <yuvipanda@gmail.com>
 Zak Greant <zak+mediawiki@fooassociates.com> <zak@users.mediawiki.org>
 Zhengzhu Feng <zhengzhu@gmail.com>
 Zhengzhu Feng <zhengzhu@gmail.com> <zhengzhu@users.mediawiki.org>
+Zoranzoki21 <zorandori4444@gmail.com>
 Zppix <support@zppixballee.com>
 Ævar Arnfjörð Bjarmason <avarab@gmail.com> <avar@users.mediawiki.org>
 Étienne Beaulé <beauleetienne0@gmail.com>
diff --git a/CREDITS b/CREDITS
index ed0ec36649..d9bdc3d8f7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -237,7 +237,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * gbt248
 * Geoffrey Mon
 * Geoffrey Trang
-* GeoffreyT2000
 * georggi
 * Gergő Tisza
 * Gero Scholz
@@ -250,12 +249,14 @@ The following list can be found parsed under Special:Version/Credits -->
 * gladoscc
 * glaisher
 * golopot
+* gopavasanth
 * Greg Maxwell
 * Greg Sabino Mullane
 * Gregory Szorc
 * Grunny
 * Guillaume Blanchard
 * Guy Van den Broeck
+* Guycn2
 * Haikal Izzuddin
 * HakanIST
 * Happy-melon
@@ -743,7 +744,7 @@ The following list can be found parsed under Special:Version/Credits -->
 * Zhaofeng Li
 * Zhengzhu Feng
 * Zhuyifei1999
-* zoranzoki21
+* Zoranzoki21
 * Zppix
 * محمد شعیب
 * 星耀晨曦
-- 
2.20.1