From: Timo Tijhof <krinklemail@gmail.com>
Date: Sun, 21 May 2017 14:18:36 +0000 (+0200)
Subject: Update CREDITS
X-Git-Tag: 1.31.0-rc.0~3195
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=a5185ac611d19c55d736c9f93b471c0c05039520;p=lhc%2Fweb%2Fwiklou.git

Update CREDITS

Also update mailmap to avoid duplicates.

Change-Id: Ic305027c47a96d6d7ea8892823c4ceb687f17e13
---

diff --git a/.mailmap b/.mailmap
index ae188781ca..e649fb132f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -412,6 +412,7 @@ Sucheta Ghoshal <sghoshal@wikimedia.org>
 Sumit Asthana <asthana.sumit23@gmail.com>
 TerraCodes <terracodes@tools.wmflabs.org>
 Thalia Chan <thalia@cantorion.org>
+Thalia Chan <thalia@cantorion.org> <thalia.e.chan@googlemail.com>
 Thiemo Mättig <thiemo.maettig@wikimedia.de>
 Thiemo Mättig <thiemo.maettig@wikimedia.de> <mr.heat@gmx.de>
 This, that and the other <at.light@live.com.au>
diff --git a/CREDITS b/CREDITS
index 1530425123..14c454e379 100644
--- a/CREDITS
+++ b/CREDITS
@@ -16,6 +16,7 @@ The following list can be found parsed under Special:Version/Credits -->
 * Aashaka Shah
 * abhinand
 * Abhishek Das
+* Ad Huikeshoven
 * Adam Miller
 * Adam Roses Wight
 * addshore
@@ -358,6 +359,7 @@ The following list can be found parsed under Special:Version/Credits -->
 * Ltrlg
 * Luc Van Oostenryck
 * Lucas Garczewski
+* Lucas Werkmeister
 * Luigi Corsaro
 * Luis Felipe Schenone
 * Luke Faraone
@@ -434,6 +436,7 @@ The following list can be found parsed under Special:Version/Credits -->
 * Mohamed Magdy
 * Molly White
 * Moriel Schottlender
+* Moritz Oberhauser
 * Mormegil
 * Mr. E23
 * MrBlueSky
@@ -618,10 +621,11 @@ The following list can be found parsed under Special:Version/Credits -->
 * T.D. Corell
 * Tarquin
 * TerraCodes
+* Thalia Chan
 * The Discoverer
 * The Evil IP address
 * theopolisme
-* Thiemo Mättig (WMDE)
+* Thiemo Mättig
 * This, that and the other
 * tholam
 * Thomas Arrow