X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.mailmap;h=860a23741b5c3fa2ae9b920c103510ac14ac3258;hb=b0caf5984ea0f6db7d864dee05c2ccdf78907298;hp=7dfa21bac2e343db367cde5f2560fe5402c019dd;hpb=91ef17aba2b063d6e6eb1f38123acc6875d8662d;p=ngircd-alex.git

diff --git a/.mailmap b/.mailmap
index 7dfa21ba..860a2374 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,8 @@ Alexander Barton <alex@barton.de> <alex@kfreebsd.barton.de>
 
 Ali Shemiran <ashemira@ucsd.edu>
 
+Christoph Biedl <ngircd.anoy@manchmal.in-ulm.de> <debian.axhn@manchmal.in-ulm.de>
+
 Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu> <dana@cs.ucsd.edu>
 Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu> <dana+70@cs.ucsd.edu>
 
@@ -14,3 +16,7 @@ DNS <dns@rbose.org>
 Götz Hoffart <goetz@hoffart.de>
 
 LucentW <lucent@zebes.info> <LucentW@users.noreply.github.com>
+
+Michi <michi+ngircd@dataswamp.org>
+
+Sam James <sam@cmpct.info> <11667869+thesamesam@users.noreply.github.com>