Update AUTHORS and .mailmap

refs #13267
refs #12881

diff --git a/.mailmap b/.mailmap
index e8a33100ce1ac760b6205df8a0e07996d4abd0f7..7f6cdb0b668f8afa5354c0b22c88e0c13b6a5fc7 100644 (file)
--- 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 b8ffcc3ce14082e0797df7eb000d0e61cb3953e3..a3351cda2e7a0b0f4a6ce3a2134a29a64a153a8d 100644 (file)
--- 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>