X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=.mailmap;h=f920b448fa0a58c633318f733c14fc33be9a1ddc;hp=8d5174989b4c576879e1660e765b02fae4956f35;hb=146c837e78449c63e858378dfc84cba9d6a490ce;hpb=4b4b29b3143af7cef2fdb9b6b37f3b0d573c9c41;ds=sidebyside

diff --git a/.mailmap b/.mailmap
index 8d5174989b..f920b448fa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,8 +13,11 @@ Christian Schmidt	<maniacikarus.ipfire.org>
 Christian Schmidt	<maniacikarus@ipfire.org>
 Christian Schmidt	<root@daedalus.homeip.net>
 Christian Schmidt	<root@ikarus.homeip.net>
+Daniel Weismüller	<whytea@ipfire.org>
 Dirk Wagner		<root@etch-server.wagner-budenheim.de>
 Heiner Schmeling	<casemaster@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
+Jan Paul Tücking	<earl@ipfire.org>
+Jörn-Ingo Weigert	<jiweigert@ipfire.org>
 Michael Tremer	<delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<michael.tremer.info>
@@ -28,4 +31,5 @@ Michael Tremer	<root@rowena.ipfire.org>
 Peter Pfeiffer	<root@VMipfire.pfeiffer-privat.de>
 Rene Zingel	<linuxadmin@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Ronald Wiesinger	<rowie@ipfire.org>
-Stéphane Pautrel <steph78630@gmail.com>
+Stéphane Pautrel	<steph78630@gmail.com>
+Erik Kapfer		<ummeegge@ipfire.org>