From 1f2ff32cca54d5526a9f863f238f078c73492aea Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thiemo=20M=C3=A4ttig?= <thiemo.maettig@wikimedia.de>
Date: Tue, 14 Nov 2017 13:59:15 +0100
Subject: [PATCH] Family name of Thiemo changed

Change-Id: I5477d02111e53790e858624c4b7c4f09dbc418fa
---
 .mailmap                                                | 5 +++--
 CREDITS                                                 | 2 +-
 includes/libs/http/HttpAcceptNegotiator.php             | 7 +++----
 tests/phpunit/includes/actions/ActionTest.php           | 5 +++--
 tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php  | 2 +-
 tests/phpunit/includes/specials/SpecialPageTestBase.php | 2 +-
 tests/phpunit/languages/LanguageCodeTest.php            | 2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.mailmap b/.mailmap
index 5a76fb950e..c4f86040f3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -413,8 +413,9 @@ 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>
+Thiemo Kreuz <thiemo.kreuz@wikimedia.de>
+Thiemo Kreuz <thiemo.kreuz@wikimedia.de> <thiemo.maettig@wikimedia.de>
+Thiemo Kreuz <thiemo.kreuz@wikimedia.de> <mr.heat@gmx.de>
 This, that and the other <at.light@live.com.au>
 tholam <t.lam@lamsinfosystem.com>
 Thomas Bleher <ThomasBleher@gmx.de> <tbleher@users.mediawiki.org>
diff --git a/CREDITS b/CREDITS
index c38c3fcc05..6ab4ad3e14 100644
--- a/CREDITS
+++ b/CREDITS
@@ -625,7 +625,7 @@ The following list can be found parsed under Special:Version/Credits -->
 * The Discoverer
 * The Evil IP address
 * theopolisme
-* Thiemo Mättig
+* Thiemo Kreuz
 * This, that and the other
 * tholam
 * Thomas Arrow
diff --git a/includes/libs/http/HttpAcceptNegotiator.php b/includes/libs/http/HttpAcceptNegotiator.php
index 5f8d9a69e1..84c1182c0c 100644
--- a/includes/libs/http/HttpAcceptNegotiator.php
+++ b/includes/libs/http/HttpAcceptNegotiator.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wikimedia\Http;
+
 /**
  * Utility for negotiating a value from a set of supported values using a preference list.
  * This is intended for use with HTTP headers like Accept, Accept-Language, Accept-Encoding, etc.
@@ -10,11 +12,8 @@
  *
  * @license GPL-2.0+
  * @author Daniel Kinzler
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
-
-namespace Wikimedia\Http;
-
 class HttpAcceptNegotiator {
 
 	/**
diff --git a/tests/phpunit/includes/actions/ActionTest.php b/tests/phpunit/includes/actions/ActionTest.php
index 4a302920e1..f97dd73e64 100644
--- a/tests/phpunit/includes/actions/ActionTest.php
+++ b/tests/phpunit/includes/actions/ActionTest.php
@@ -3,10 +3,11 @@
 /**
  * @covers Action
  *
- * @author Thiemo Mättig
- *
  * @group Action
  * @group Database
+ *
+ * @licence GNU GPL v2+
+ * @author Thiemo Kreuz
  */
 class ActionTest extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
index 4b03fda7b7..fe7c506978 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
@@ -6,7 +6,7 @@
  * @group JobQueue
  *
  * @licence GNU GPL v2+
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class JobQueueMemoryTest extends PHPUnit_Framework_TestCase {
 
diff --git a/tests/phpunit/includes/specials/SpecialPageTestBase.php b/tests/phpunit/includes/specials/SpecialPageTestBase.php
index 930bbe4de7..b1d8c69ed3 100644
--- a/tests/phpunit/includes/specials/SpecialPageTestBase.php
+++ b/tests/phpunit/includes/specials/SpecialPageTestBase.php
@@ -9,7 +9,7 @@
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author Daniel Kinzler
  * @author Addshore
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 abstract class SpecialPageTestBase extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/languages/LanguageCodeTest.php b/tests/phpunit/languages/LanguageCodeTest.php
index 0da03dfecc..950d2df36b 100644
--- a/tests/phpunit/languages/LanguageCodeTest.php
+++ b/tests/phpunit/languages/LanguageCodeTest.php
@@ -6,7 +6,7 @@
  * @group Language
  *
  * @license GPL-2.0+
- * @author Thiemo Mättig
+ * @author Thiemo Kreuz
  */
 class LanguageCodeTest extends PHPUnit_Framework_TestCase {
 
-- 
2.20.1