Update .mailmap with recent contributors.

I should have updated everyone who committed since the migration to git (giving me a canonical email).

I've search git shortlog -s to ensure the best I could that there are no duplicate. I discovered that email addresses from the mailmap are uncapitalised whereas the unmodified addresses are not, creating two different authors for no reason. So, I've added some record to normalise the canonical email addresses when needed.

1 files changed, 20 insertions, 12 deletions

diff --git a/.mailmap b/.mailmap
index ea7f0378b..ef5453598 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,29 +9,37 @@
 ## If you're mentionned here and want to update your information,
 ## either amend this file and commit it, or contact the coqdev list
 
-Bruno Barras <barras@gforge>                       barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Bruno Barras <barras@gforge>                       barras-local <barras-local@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Bruno Barras <bruno.barras@inria.fr>               barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Bruno Barras <bruno.barras@inria.fr>               barras-local <barras-local@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Yves Bertot <bertot@gforge>                        bertot <bertot@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Frédéric Besson <fbesson@gforge>                   fbesson <fbesson@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Pierre Boutillier <pboutill@gforge>                pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Xavier Clerc <xclerc@gforge>                       xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Frédéric Besson <frederic.besson@inria.fr>         fbesson <fbesson@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Boutillier <pierre.boutillier@ens-lyon.org> pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Boutillier <pierre.boutillier@ens-lyon.org> Pierre <pierre.boutillier@ens-lyon.org>
+Xavier Clerc <xavier.clerc@inria.fr>               xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Xavier Clerc <xavier.clerc@inria.fr>               xclerc <xavier.clerc@inria.fr>
 Pierre Corbineau <corbinea@gforge>                 corbinea <corbinea@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Judicaël Courant <courant@gforge>                  courant <courant@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Pierre Courtieu <courtieu@gforge>                  courtieu <courtieu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Courtieu <Pierre.Courtieu@cnam.fr>          courtieu <courtieu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+# uncapitalises the email address:
+Pierre Courtieu <Pierre.Courtieu@cnam.fr>          Pierre Courtieu <Pierre.Courtieu@cnam.fr>
 David Delahaye <delahaye@gforge>                   delahaye <delahaye@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Maxime Dénès <mdenes@gforge>                       mdenes <mdenes@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Maxime Dénès <mail@maximedenes.fr>                 mdenes <mdenes@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Daniel De Rauglaudre <ddr@gforge>                  ddr <ddr@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Olivier Desmettre <desmettr@gforge>                desmettr <desmettr@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Damien Doligez <doligez@gforge>                    doligez <doligez@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Jean-Christophe Filliâtre <filliatr@gforge>        filliatr <filliatr@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Julien Forest <julien.forest@ensiie.fr>            jforest <jforest@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Julien Forest <julien.forest@ensiie.fr>            forest <jforest@mourvedre.ensiie.fr>
-Stéphane Glondu <glondu@gforge>                    glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Stéphane Glondu <steph@glondu.net>                 glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+# corrects accent:
+Stéphane Glondu <steph@glondu.net>                 Stephane Glondu <steph@glondu.net>
 Benjamin Grégoire <bgregoire@gforge>               bgregoir <bgregoir@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Benjamin Grégoire <bgregoire@gforge>               gregoire <gregoire@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Vincent Gross <vgross@gforge>                      vgross <vgross@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Huang Guan-Shieng <huang@gforge>                   huang <huang@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Hugo Herbelin <herbelin@gforge>                    herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Hugo Herbelin <Hugo.Herbelin@inria.fr>             herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>
+# uncapitalises the email address:
+Hugo Herbelin <Hugo.Herbelin@inria.fr>             Hugo Herbelin <Hugo.Herbelin@inria.fr>
 Tom Hutchinson <thutchin@gforge>                   thutchin <thutchin@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Cezary Kaliszyk <cek@gforge>                       cek <cek@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Florent Kirchner <fkirchne@gforge>                 fkirchne <fkirchne@85f007b7-540e-0410-9357-904b9bb8a0f7>
@@ -42,7 +50,7 @@ Evgeny Makarov <emakarov@gforge>                   emakarov <emakarov@85f007b7-5
 Lionel Elie Mamane <lmamane@gforge>                lmamane <lmamane@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Claude Marché <marche@gforge>                      marche <marche@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Micaela Mayero <mayero@gforge>                     mayero <mayero@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Guillaume Melquiond <gmelquio@gforge>              gmelquio <gmelquio@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Guillaume Melquiond <guillaume.melquiond@inria.fr> gmelquio <gmelquio@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Alexandre Miquel <miquel@gforge>                   miquel <miquel@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Benjamin Monate <monate@gforge>                    monate <monate@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Julien Narboux <jnarboux@gforge>                   jnarboux <jnarboux@85f007b7-540e-0410-9357-904b9bb8a0f7>
@@ -60,8 +68,8 @@ Clément Renard <clrenard@gforge>                   clrenard <clrenard@85f007b7-
 Claudio Sacerdoti Coen <sacerdot@gforge>           sacerdot <sacerdot@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Vincent Siles <vsiles@gforge>                      vsiles <vsiles@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Elie Soubiran <soubiran@gforge>                    soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Matthieu Sozeau <msozeau@gforge>                   msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Arnaud Spiwack <aspiwack@gforge>                   aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Matthieu Sozeau <mattam@mattam.org>                msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Arnaud Spiwack <arnaud@spiwack.net>                aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Enrico Tassi <Enrico.Tassi@inria.fr>               gareuselesinge <gareuselesinge@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Laurent Théry <thery@gforge>                       thery <thery@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Benjamin Werner <werner@gforge>                    werner <werner@85f007b7-540e-0410-9357-904b9bb8a0f7>