X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=.mailmap;h=08653c701ec3ee68efc985d320dd6af201b472e1;hp=5a9212aeaae36b6753927b0790127dc230a10a07;hb=bc051eac54375a7f90b1d157414610f58de8c34a;hpb=3c68549f8c8f5246be8c403557b0505f634b7516

diff --git a/.mailmap b/.mailmap
index 5a9212aeaa..08653c701e 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,3 +31,6 @@ 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>
+Erik Kapfer		<ummeegge@ipfire.org>
+Stephan Feddersen	<sfeddersen@ipfire.org>