From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 8 May 2017 13:37:49 +0000 (+0000)
Subject: Merge "Remove "(WMDE)" from my name in .mailmap"
X-Git-Tag: 1.31.0-rc.0~3307
X-Git-Url: https://git.heureux-cyclage.org/index.php?a=commitdiff_plain;h=870c78b9947e516aca1c38c3bca59421fc770336;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove "(WMDE)" from my name in .mailmap"
---

870c78b9947e516aca1c38c3bca59421fc770336
diff --cc .mailmap
index 7fcf3daf0b,cd11b59524..ae188781ca
--- a/.mailmap
+++ b/.mailmap
@@@ -410,10 -409,9 +410,10 @@@ Steven Walling <swalling@wikimedia.org
  Subramanya Sastry <ssastry@wikimedia.org>
  Sucheta Ghoshal <sghoshal@wikimedia.org>
  Sumit Asthana <asthana.sumit23@gmail.com>
 +TerraCodes <terracodes@tools.wmflabs.org>
  Thalia Chan <thalia@cantorion.org>
- Thiemo Mättig (WMDE) <thiemo.maettig@wikimedia.de>
- Thiemo Mättig (WMDE) <thiemo.maettig@wikimedia.de> <mr.heat@gmx.de>
+ 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>
  tholam <t.lam@lamsinfosystem.com>
  Thomas Bleher <ThomasBleher@gmx.de> <tbleher@users.mediawiki.org>