From 4f53be82f340357350075aa146fc180a84b4d12c Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Mon, 18 Apr 2011 16:36:24 +0200
Subject: [PATCH] [git] Change user mail adress

---
 .gitconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index cd41c4d..2d945c7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [user]
     name = Mathieu Maret
-    email = mathieu.maret@openwide.fr
+    email = mathieu.maret@gmail.com
 [color]
     ui = auto
     diff = auto
@@ -15,3 +15,5 @@
     co = checkout
 [diff "odf"]
     textconv=odt2txt
+[diff "odt"]
+    textconv=odt2txt