Update AUTHORS and .mailmap

refs #13267
refs #12881
This commit is contained in:
Michael Friedrich 2016-11-21 11:33:48 +01:00
parent 9eee9ab8d2
commit 930a3f1d37
2 changed files with 2 additions and 0 deletions

View File

@ -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>

View File

@ -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>