aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond2017-09-05 14:35:15 +0200
committerGuillaume Melquiond2017-09-05 14:35:20 +0200
commitbb5fa2a3a2a1e398683d38a8731faa2ff3ec39b0 (patch)
treec6db35509db2cbf09ce397015392fe9c6c10c889
parent6a81f080d7dc948e3cb325bd00aa6ea57d365503 (diff)
parent2123fb17f65162b7299cb29d1fc48c222922fa04 (diff)
Merge PR #1020: .mailmap update
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index f40455aa77..b4271b9613 100644
--- a/.mailmap
+++ b/.mailmap
@@ -39,7 +39,8 @@ Julien Forest <julien.forest@ensiie.fr> jforest <jforest@thune>
Julien Forest <julien.forest@ensiie.fr> jforest <jforest@daneel.lan.home>
Julien Forest <julien.forest@ensiie.fr> Julien Forest <forest@ensiie.fr>
Emilio Jesus Gallego Arias <e+git@x80.org> Emilio Jesús Gallego Arias <e+git@x80.org>
-Gaëtan Gilbert <gaetan.gilbert@ens-lyon.fr> Gaetan Gilbert <gaetan.gilbert@ens-lyon.fr>
+Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> <gaetan.gilbert@ens-lyon.fr>
+Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> <gaetan.gilbert@skyskimmer.net>
Stéphane Glondu <steph@glondu.net> glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
Stéphane Glondu <steph@glondu.net> Stephane Glondu <steph@glondu.net>
Benjamin Grégoire <benjamin.gregoire@inria.fr> Benjamin Gregoire <Benjamin.Gregoire@inria.fr>