From: Benny Baumann <BenBE1987@gmx.net>
Date: Mon, 13 Mar 2017 19:18:13 +0000 (+0100)
Subject: Merge "fix: add .mailmap to fix commit information"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=e1974c51d0900a101ffbda8c5f1280b938f42804;hp=3de4f1e480be4036ab2034d5cb2b670665711b9e

Merge "fix: add .mailmap to fix commit information"
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..98b58fa8
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+<BenBE1987@gmx.net> <BenBE@geshi.org>
+Felix Dörre <felix@dogcraft.de>