From c67431f126a076a9756e0ecabc10f335637d6db9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 10 Feb 2015 12:14:57 +0100
Subject: [PATCH] [FIX] mailmap for parent commit

---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 4ccd6f944c1..d509ccb5c37 100644
--- a/.mailmap
+++ b/.mailmap
@@ -437,6 +437,7 @@ Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com>
 Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com> <jgrandguillaume@tunupa.wrk.lsn.camptocamp.com>
 Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com> Joël Grand-Guillaume @ CampToCamp <>
 Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com> Joël Grand-Guillaume,Jvo <>
+Joël Grand-Guillaume <joel.grandguillaume@camptocamp.com> <joel.grandguillaume@gmail.com>
 Juan Rial <jri@openerp.com>
 Juan Rial <jri@openerp.com> <jrial@safehex.be>
 Juan Rial <jri@openerp.com> jri@openerp.com <>