From e6eca9bf571d5e37404093a497df18a5e2317953 Mon Sep 17 00:00:00 2001
From: The Dlang Bot <code+dlang-bot@dawg.eu>
Date: Fri, 14 Jun 2019 08:54:12 +0200
Subject: [PATCH 1/2] Merge pull request #373 from tchaloupka/patch-1

Update .mailmap
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 1082ddeb2de..b01a7118700 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,7 +19,7 @@ Boris Carvajal <boris2.9@gmail.com>
 Brad Anderson <root>
 Brian Schott <briancschott@gmail.com>
 Brian Schott <briancschott@gmail.com> <Hackerpilot>
-Chalucha <chalucha@gmail.com>
+Tomáš Chaloupka <chalucha@gmail.com>
 Christian Juelg <c.juelg@gmail.com>
 Clement Courbet <legrosbuffle@somebod.com> <clem@somebod.com>
 D8174 <michaelpm394@gmail.com>

From 3d4b001c27cb8dd75b39f9380e45f100035d5f2e Mon Sep 17 00:00:00 2001
From: The Dlang Bot <code+dlang-bot@dawg.eu>
Date: Fri, 14 Jun 2019 09:28:38 +0200
Subject: [PATCH 2/2] Merge pull request #374 from belka-ew/duplicate-alias

Add aliases for Mathis Beer and Suleyman Sahmi
merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index b01a7118700..2c490337e35 100644
--- a/.mailmap
+++ b/.mailmap
@@ -70,6 +70,8 @@ Martin Nowak <code@dawg.eu> <dawg@dawgfoto>
 Mathias Lang <mathias.lang@sociomantic.com> <geod24@gmail.com>
 Mathias Lang <mathias.lang@sociomantic.com> <mathias.lang@epitech.eu>
 Mathias Lang <mathias.lang@sociomantic.com> <pro.mathias.lang@gmail.com>
+Mathis Beer <mathis.beer@funkwerk-itk.com> <default_357-line@yahoo.de>
+Mathis Beer <mathis.beer@funkwerk-itk.com> <540727+FeepingCreature@users.noreply.github.com>
 Mike Franklin <slavo5150@yahoo.com>
 Mike Franklin <slavo5150@yahoo.com> <JinShil@users.noreply.github.com>
 Mike Parker <aldacron@gmail.com>
@@ -114,3 +116,4 @@ Yazan Dabain <yazan.dabain@arabiaweather.com> <yazan.dabain@gmail.com>
 Михаил Страшун <public@dicebot.lv> <m.strashun@gmail.com>
 Михаил Страшун <public@dicebot.lv> <mihails.strasuns.contractor@sociomantic.com>
 Михаил Страшун <public@dicebot.lv> <registrations@dicebot.lv>
+سليمان السهمي (Suleyman Sahmi) <sahmi.soulaimane@gmail.com>