aboutsummaryrefslogtreecommitdiffhomepage
path: root/.mailmap
diff options
context:
space:
mode:
authorGravatar Arnaud Spiwack <arnaud@spiwack.net>2014-08-07 11:06:09 +0200
committerGravatar Arnaud Spiwack <arnaud@spiwack.net>2014-08-07 11:06:09 +0200
commite71a7e83c14a4ae77bbabcbf9c67a9cb55995bb5 (patch)
treecde439e1e60ea6d217d4a6d9fa2fae426ee05866 /.mailmap
parent51bc3d21498afe69f5545d52227e5165928301c8 (diff)
More .mailmap update.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 04c3dbbb0..a86b0c818 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,8 +11,8 @@
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>
-Yves Bertot <bertot@gforge> Yves Bertot <bertot@inria.fr>
+Yves Bertot <bertot@inria.fr> bertot <bertot@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Yves Bertot <bertot@inria.fr> Yves Bertot <bertot@inria.fr>
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>