billiob pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=9a6dce7f68631f925c949d299ba2131c31e91ee0

commit 9a6dce7f68631f925c949d299ba2131c31e91ee0
Author: Boris Faure <bill...@gmail.com>
Date:   Sun Oct 5 15:01:09 2014 +0200

    synchronize mailmap
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index c96e4c3..4408ceb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,8 @@ Cedric BAIL <cedric.b...@free.fr> Cedric Bail 
<cedric.b...@samsung.com>
 Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <cedric.b...@samsung.com>
 Cedric BAIL <cedric.b...@free.fr> Cedric Bail <cedric.b...@free.fr>
 Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <ced...@efl.so>
+Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <c.b...@partner.samsung.com>
+Cedric BAIL <cedric.b...@free.fr> Cedric BAIL <ced...@osg.samsung.com>
 Vincent Torri <vincent.to...@gmail.com> Vincent Torri <vto...@univ-evry.fr>
 Tom Hacohen <t...@stosb.com> Tom 'TAsn' Hacohen <t...@stosb.com>
 Tom Hacohen <t...@stosb.com> Tom <t...@stosb.com>
@@ -57,6 +59,7 @@ Jean Guyomarc'h <jean.guyoma...@gmail.com> Jean GUYOMARC'H 
<jean.guyomarch@gmail
 Marcel Hollerbach <marcel-hollerb...@t-online.de> Marcel Hollerbach 
<marcel.hollerb...@stzedn.de>
 Jean-Philippe ANDRÉ <j...@videolan.org> Jean-Philippe Andre 
<jp.an...@samsung.com>
 Jean-Philippe ANDRÉ <j...@videolan.org> Jean-Philippe ANDRE <j...@videolan.org>
+Jean-Philippe ANDRÉ <j...@videolan.org> Jean-Philippe Andre <j...@videolan.org>
 Amitesh Singh <amitesh...@samsung.com> Amitesh Singh <amitesh...@samsung.com>
 Amitesh Singh <amitesh...@samsung.com> ami <singh.amit...@gmail.com>
 Amitesh Singh <amitesh...@samsung.com> Amitesh Singh <singh.amit...@gmail.com>
@@ -70,3 +73,4 @@ Daniel Kolesa <d.kol...@samsung.com> Daniel 'q66' Kolesa 
<d.kol...@samsung.com>
 Wonguk Jeong <wonguk.je...@samsung.com> Wonguk Jeong <huchi...@gmail.com>
 Wonguk Jeong <wonguk.je...@samsung.com> wonguk.jeong <wonguk.je...@samsung.com>
 Kai Huuhko <kai.huu...@gmail.com> Kai Huuhko <k.huu...@partner.samsung.com>
+Massimo Maiurana <maiur...@gmail.com> maxerba <maiur...@gmail.com>

-- 


Reply via email to