update .mailmap

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/.mailmap b/.mailmap
index 7f1f623..a3e389c 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,12 +1,25 @@
 <jean@pryen.org> <privat@ciara.pryen.org>
+<jean@pryen.org> <jean@x400.pryen.org>
 
 Alexandre Terrasa <alexandre@moz-code.org> <alexadre@moz-code.org>
 <alexandre@moz-code.org> <alexandre@moz-concept.com>
 Alexandre Terrasa <alexandre@moz-code.org> <alexandre.terrasa@gmail.com>
+<alexandre@moz-code.org> <Morriar@users.noreply.github.com>
 
-Lucas Bajolet <lucas.bajolet@hotmail.com>
-Lucas Bajolet <lucas.bajolet@hotmail.com> <r4pass@hotmail.com>
-Lucas Bajolet <lucas.bajolet@hotmail.com> <r4pass@r4pass-ubu-laptophp.(none)>
-<lucas.bajolet@hotmail.com> <r4pass@localhost.localdomain> 
+Lucas Bajolet <r4pass@hotmail.com> <lucas.bajolet@hotmail.com>
+Lucas Bajolet <r4pass@hotmail.com>
+Lucas Bajolet <r4pass@hotmail.com> <r4pass@r4pass-ubu-laptophp.(none)>
+<r4pass@hotmail.com> <r4pass@localhost.localdomain>
 
 Nathan Heu <heu.nathan@courrier.uqam.ca>
+
+Geoffrey Hecht <geoffrey.hecht@gmail.com>
+
+Johan Kayser <johan.kayser@viacesi.fr>
+
+Romain Chanoir <romain.chanoir@viacesi.fr> 
+<romain.chanoir@viacesi.fr> <chanoir.romain@courrier.uqam.ca>
+
+Clement de Figueiredo <clement.defigueiredo@gmail.com>
+
+Christophe Gigax <christophe.gigax@viacesi.fr>