From 7bf7dca588710bba38a173dedb2a3cb7408c1b2a Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Thu, 3 Dec 2015 10:45:16 +0100
Subject: add .mailmap to uniform names/email of committers

---
 .gitattributes | 1 +
 .mailmap       | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 .mailmap

diff --git a/.gitattributes b/.gitattributes
index e4504cf..51c6be8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 .git* export-ignore
+.mailmap export-ignore
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..87f1ee6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Enrico Tassi <Enrico.Tassi@inria.fr>               <enrico.tassi@inria.fr>
+Enrico Tassi <Enrico.Tassi@inria.fr>               <gares@fettunta.org>
+
+Assia Mahboubi <Assia.Mahboubi@inria.fr>	<assia.mahboubi@inria.fr>
+
+Cyril Cohen <Cyril.Cohen@inria.fr>	<barbichu@crans.org>
+Cyril Cohen <Cyril.Cohen@inria.fr>	<cohen@crans.org>	
-- 
cgit v1.2.3