X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=.mailmap;h=ab70551b8dac671d370d86bed1dce236de2494e2;hb=6387f5442ec92f56f2bdaa7379b7caf02e91938c;hp=890bc619e4a15ca7ae4aea4c09c0e6630953c2d8;hpb=910c2b8cfac81532a9a690477f46b3e49dc6697a;p=icinga2

diff --git a/.mailmap b/.mailmap
index 890bc619e..ab70551b8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,14 +4,19 @@
 Gunnar Beutner <gunnar.beutner@icinga.com> <icinga@net-icinga2.adm.netways.de>
 <michael.friedrich@icinga.com> <michael.friedrich@gmail.com>
 <michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
+Michael Insel <mcktr55@gmail.com> <mcktr55@gmail.com>
 <tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
-Jean-Marcel Flach <jean-marcel.flach@icinga.com> <jean-marcel.flach@netways.de>
+Jean Flach <jean-marcel.flach@icinga.com> <jean-marcel.flach@netways.de>
+Jean Flach <jean-marcel.flach@icinga.com> <Crunsher@users.noreply.github.com>
+Jean 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>
 <markus.frosch@icinga.com> <markus@lazyfrosch.de>
 <markus.frosch@icinga.com> <lazyfrosch@icinga.org>
-<thomas.widhalm@netways.de> <widhalmt@widhalmt.or.at>
+<bernd.erk@icinga.com> <bernd.erk@icinga.org>
+<thomas.widhalm@icinga.com> <thomas.widhalm@netways.de>
+<thomas.widhalm@icinga.com> <widhalmt@widhalmt.or.at>
 <assaf@aikilinux.com> <assaf.flatto@livepopuli.com>
 <marius@graylog.com> <marius@torch.sh>
 <jason.young@velaspan.com> <jyoung15@gmail.com>
@@ -21,3 +26,9 @@ Claudio Kuenzler <ck@claudiokuenzler.com>
 <eric.lippmann@icinga.com> <eric.lippmann@netways.de>
 <johannes.meyer@icinga.com> <johannes.meyer@netways.de>
 <nicole.lang@icinga.com> <nicole.lang@netways.de>
+<dirk.goetz@icinga.com> <dirk.goetz@netways.de>
+<lennart.betz@icinga.com> <lennart.betz@netways.de>
+<lars.engels@0x20.net> <lars@0x20.net>
+Marianne Spiller <github@spiller.me>
+Robin O'Brien <robin@labs.epiuse.com> <robinjohnobrien@gmail.com>
+<noah.hilverling@icinga.com> <noah@hilverling.com>