From 3b6a50c0fc828f172e8dfc746a62d3566a8fc8c1 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey <pierre.letouzey@inria.fr>
Date: Thu, 21 Nov 2013 20:26:34 +0100
Subject: updated .mailmap

---
 .mailmap | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 43469043b..4322a0981 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,7 +24,8 @@ Daniel De Rauglaudre <ddr@gforge>                  ddr <ddr@85f007b7-540e-0410-9
 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 <jforest@gforge>                     jforest <jforest@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>
 Benjamin Grégoire <bgregoire@gforge>               bgregoir <bgregoir@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Benjamin Grégoire <bgregoire@gforge>               gregoire <gregoire@85f007b7-540e-0410-9357-904b9bb8a0f7>
@@ -51,7 +52,7 @@ Jean-Marc Notin <notin@gforge>                     notin <notin@85f007b7-540e-04
 Russel O'Connor <roconnor@gforge>                  roconnor <roconnor@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Christine Paulin <cpaulin@gforge>                  cpaulin <cpaulin@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Christine Paulin <cpaulin@gforge>                  mohring <mohring@85f007b7-540e-0410-9357-904b9bb8a0f7>
-Pierre-Marie Pédrot <ppedrot@gforge>               ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Loïc Pottier <pottier@gforge>                      pottier <pottier@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Matthias Puech <puech@gforge>                      puech <puech@85f007b7-540e-0410-9357-904b9bb8a0f7>
 Yann Régis-Gianas <regisgia@gforge>                regisgia <regisgia@85f007b7-540e-0410-9357-904b9bb8a0f7>
-- 
cgit v1.2.3