X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.mailmap;h=975e6758efa85c674207ffd6b400e3bbab2576a2;hb=9c787f3f88f077ad23498cf03b1b57ac3bd41b33;hp=373476bdc03f718b4c01471dd9996ee4497f43a8;hpb=f8c62880ef22b74ea6df47bb349ff0743d2a93f9;p=git.git

diff --git a/.mailmap b/.mailmap
index 373476bdc..975e6758e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,6 +41,7 @@ Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+<nico@fluxnic.net> <nico@cam.org>
 Philippe Bruhat <book@cpan.org>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>