stefan pushed a commit to branch master.

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

commit cd419e96e5d02645bff4699a14131fc5cf26fb59
Author: Stefan Schmidt <[email protected]>
Date:   Mon Nov 18 16:35:32 2013 +0100

    mailmap: Sync file with changes from efl
---
 .mailmap | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.mailmap b/.mailmap
index ece597b..c412505 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,38 +8,40 @@
 
 Carsten Haitzler <[email protected]> Carsten Haitzler (Rasterman) 
<[email protected]>
 Cedric BAIL <[email protected]> Cedric Bail <[email protected]>
-Cedric BAIL <[email protected]> Cedric BAIL <[email protected]> 
-Cedric BAIL <[email protected]> Cedric Bail <[email protected]> 
+Cedric BAIL <[email protected]> Cedric BAIL <[email protected]>
+Cedric BAIL <[email protected]> Cedric Bail <[email protected]>
 Cedric BAIL <[email protected]> Cedric BAIL <[email protected]>
 Vincent Torri <[email protected]> Vincent Torri <[email protected]>
-Tom Hacohen <[email protected]> Tom 'TAsn' Hacohen <[email protected]> 
+Tom Hacohen <[email protected]> Tom 'TAsn' Hacohen <[email protected]>
 Tom Hacohen <[email protected]> Tom <[email protected]>
-Gustavo Sverzut Barbieri <[email protected]> Gustavo Sverzut Barbieri 
<[email protected]> 
+Gustavo Sverzut Barbieri <[email protected]> Gustavo Sverzut Barbieri 
<[email protected]>
 Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
 Christopher Michael <[email protected]> Christopher Michael 
<[email protected]>
 Christopher Michael <[email protected]> Chris Michael 
<[email protected]>
 Christopher Michael <[email protected]> Chris Michael 
<[email protected]>
 Sebastian Dransfeld <[email protected]> Sebastian Dransfeld 
<[email protected]>
+Sebastian Dransfeld <[email protected]> sebastid <sebastid>
 Mike Blumenkrantz <[email protected]> Mike Blumenkrantz 
<[email protected]>
+Mike Blumenkrantz <[email protected]> discomfitor 
<[email protected]>
 ChunEon Park <[email protected]> ChunEon Park <[email protected]>
 David Walter Seikel <[email protected]> David Walter Seikel 
<[email protected]>
 Rafael Antognolli <[email protected]> Rafael Antognolli 
<[email protected]>
 Rafael Antognolli <[email protected]> Rafael Antognolli 
<[email protected]>
-Iván Briano <[email protected]> Ivan Briano <[email protected]> 
+Iván Briano <[email protected]> Ivan Briano <[email protected]>
 Iván Briano <[email protected]> Ivan Briano <[email protected]>
 Lucas De Marchi <[email protected]> Lucas De Marchi 
<[email protected]>
 Jihoon Kim <[email protected]> Jihoon Kim <[email protected]>
 Stefan Schmidt <[email protected]> Stefan Schmidt 
<[email protected]>
 Jonas M. Gastal <[email protected]> Jonas Gastal <[email protected]>
-Daniel Juyung Seo <[email protected]> Daniel Juyung Seo 
<[email protected]> 
+Daniel Juyung Seo <[email protected]> Daniel Juyung Seo 
<[email protected]>
 Daniel Juyung Seo <[email protected]> Daniel Juyung Seo 
<[email protected]>
 Daniel Willmann <[email protected]> Daniel Willmann 
<[email protected]>
 Gustavo Lima Chaves <[email protected]> Gustavo Lima Chaves 
<[email protected]>
 José Roberto de Souza <[email protected]> José Roberto de Souza 
<[email protected]>
 José Roberto de Souza <[email protected]> José Roberto de Souza 
<[email protected]>
 José Roberto de Souza <[email protected]> José Roberto de Souza 
<[email protected]>
-Mike McCormack <[email protected]> Mike McCormack <[email protected]> 
-Mike McCormack <[email protected]> Mike McCormack <[email protected]> 
+Mike McCormack <[email protected]> Mike McCormack <[email protected]>
+Mike McCormack <[email protected]> Mike McCormack <[email protected]>
 Mike McCormack <[email protected]> Mike McCormack <[email protected]>
 Mike McCormack <[email protected]> Mike McCormack <[email protected]>
 Boris Faure <[email protected]> Boris 'billiob' Faure <[email protected]>

-- 


Reply via email to