X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.mailmap;h=5a9212aeaae36b6753927b0790127dc230a10a07;hb=HEAD;hp=ec5ad1987878b7345d819d1f0c991a91957630cf;hpb=86705346a7d2c8f00758e9195a0d74368dc38375;p=people%2Fummeegge%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>