X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=.mailmap;h=860a23741b5c3fa2ae9b920c103510ac14ac3258;hb=2ff76d7f480b87e811af81cf9eaa9822b77863c4;hp=f7e3eb6e5d0dcf062ac14b19ee967ad3bf58496e;hpb=86d27eaf8977c5e6f92fa192d0b2db82ea60b647;p=ngircd.git

diff --git a/.mailmap b/.mailmap
index f7e3eb6e..860a2374 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,9 +6,17 @@ 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>
 
 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>