From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Mon, 21 Nov 2016 10:33:48 +0000 (+0100)
Subject: Update AUTHORS and .mailmap
X-Git-Tag: v2.6.0~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=930a3f1d370dabef84b0c20d222aa81495627a70;p=icinga2

Update AUTHORS and .mailmap

refs #13267
refs #12881
---

diff --git a/.mailmap b/.mailmap
index e8a33100c..7f6cdb0b6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Gunnar Beutner <gunnar.beutner@icinga.com> <icinga@net-icinga2.adm.netways.de>
 <michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
 <tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
 Jean-Marcel Flach <jean-marcel.flach@icinga.com> <jean-marcel.flach@netways.de>
+Jean-Marcel Flach <jean-marcel.flach@icinga.com> Jean Flach <jean-marcel.flach@icinga.com>
 Dolf Schimmel <dolf@transip.nl> <dolf@dolfschimmel.nl>
 Markus Waldmüller <markus.waldmueller@netways.de>
 Claudio Kuenzler <ck@claudiokuenzler.com>
diff --git a/AUTHORS b/AUTHORS
index b8ffcc3ce..a3351cda2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -80,6 +80,7 @@ Matthaus Owens <matthaus@puppetlabs.com>
 Matthias Schales <black-dragon131@web.de>
 Max Zhang <zhenzhan@tibco.com>
 Mhd Sulhan <ms@kilabit.info>
+Micha Ahrweiler <me@schnitzi.net>
 Michael Friedrich <michael.friedrich@icinga.com>
 Michael Kraus <michael.kraus@consol.de>
 Mirco Bauer <meebey@meebey.net>