synchronize mailmap

diff --git a/.mailmap b/.mailmap
index c96e4c38f629891aa8729a2074fa5b3ea585d98f..4408ceb62de8decfee397aef860cb75834d0f988 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,8 @@ Cedric BAIL <cedric.bail@free.fr> Cedric Bail <cedric.bail@samsung.com>
 Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric.bail@samsung.com>
 Cedric BAIL <cedric.bail@free.fr> Cedric Bail <cedric.bail@free.fr>
 Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@efl.so>
+Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <c.bail@partner.samsung.com>
+Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@osg.samsung.com>
 Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
 Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
 Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
@@ -57,6 +59,7 @@ Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail
 Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
 Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
+Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
 Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
 Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
 Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
@@ -70,3 +73,4 @@ Daniel Kolesa <d.kolesa@samsung.com> Daniel 'q66' Kolesa <d.kolesa@samsung.com>
 Wonguk Jeong <wonguk.jeong@samsung.com> Wonguk Jeong <huchijwk@gmail.com>
 Wonguk Jeong <wonguk.jeong@samsung.com> wonguk.jeong <wonguk.jeong@samsung.com>
 Kai Huuhko <kai.huuhko@gmail.com> Kai Huuhko <k.huuhko@partner.samsung.com>
+Massimo Maiurana <maiurana@gmail.com> maxerba <maiurana@gmail.com>