X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.mailmap;h=08653c701ec3ee68efc985d320dd6af201b472e1;hb=4979ba0aaf8d088ae317fbd0751f184dc34f428f;hp=ec5ad1987878b7345d819d1f0c991a91957630cf;hpb=a13ddf04d9b58ee469b5da6bc0dd5efb64d6ebad;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/.mailmap b/.mailmap
index ec5ad19878..08653c701e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,3 +32,5 @@ 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>