X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.mailmap;h=b8f710ddf91ebefeb087e1ed70757ecbdf57a170;hb=5f6f2e0b7c5abe9403cda1c41837827fa73e5fa2;hp=f920b448fa0a58c633318f733c14fc33be9a1ddc;hpb=f6a1d9e929041315d122ddd0babed554bdaeb23f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/.mailmap b/.mailmap
index f920b448fa..b8f710ddf9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ 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>
+Jörn-Ingo Weigert	<jiweigert@gmail.com>
 Michael Tremer	<delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<michael.tremer.info>
@@ -33,3 +34,4 @@ 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>