From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Mon, 21 Nov 2016 14:36:04 +0000 (+0100)
Subject: .mailmap, CREDITS: Correct Alexandre Emsenhuber's (IAlex) name
X-Git-Tag: 1.31.0-rc.0~4807^2
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=7128b5dccf996e8d9bbbe3e4b94c1fd47292264f;p=lhc%2Fweb%2Fwiklou.git

.mailmap, CREDITS: Correct Alexandre Emsenhuber's (IAlex) name

Change-Id: I129fdefecced2092e201a27af131109c5e253712
---

diff --git a/.mailmap b/.mailmap
index 02cd003bea..dd968e8d08 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,9 +32,9 @@ addshore <addshorewiki@gmail.com>
 Aditya Sastry <ganeshaditya1@gmail.com>
 Adrian Heine <adrian.heine@wikimedia.de>
 Alex Z. <mrzmanwiki@gmail.com> <mrzman@users.mediawiki.org>
-Alexander Emsenhuber <ialex.wiki@gmail.com>
-Alexander Emsenhuber <ialex.wiki@gmail.com> <ialex@users.mediawiki.org>
-Alexander Emsenhuber <ialex.wiki@gmail.com> <mediawiki@emsenhuber.ch>
+Alexandre Emsenhuber <ialex.wiki@gmail.com>
+Alexandre Emsenhuber <ialex.wiki@gmail.com> <ialex@users.mediawiki.org>
+Alexandre Emsenhuber <ialex.wiki@gmail.com> <mediawiki@emsenhuber.ch>
 Alexander Monk <krenair@gmail.com>
 Alexander Monk <krenair@gmail.com> <alex@wikimedia.org>
 Alexander Monk <krenair@gmail.com> <krenair@wikimedia.org>
diff --git a/CREDITS b/CREDITS
index 1c1cf8795c..d9ff9709f1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -34,7 +34,6 @@ following names for their contribution to the product.
 * Alex Ivanov
 * Alex Shih-Han Lin
 * Alex Z.
-* Alexander Emsenhuber
 * Alexander I. Mashin
 * Alexander Lehmann
 * Alexander Monk