devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0e17e5c76c1b358d3aacaa7851d0427e1f37c980
commit 0e17e5c76c1b358d3aacaa7851d0427e1f37c980
Author: Chris Michael <cpmich...@osg.samsung.com>
Date: Tue Feb 2 15:02:20 2016 -0500
elementary: update mailmap addresses
Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
.mailmap | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index d9d6852..0bb03a3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,10 +17,10 @@ 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>
Gustavo Sverzut Barbieri <barbi...@gmail.com> Gustavo Sverzut Barbieri
<barbi...@profusion.mobi>
-Christopher Michael <devilho...@comcast.net> Christopher Michael
<cpmicha...@comcast.net>
+Christopher Michael <devilho...@comcast.net> Christopher Michael
<cpmich...@comcast.net>
Christopher Michael <devilho...@comcast.net> Christopher Michael
<cp.mich...@samsung.com>
-Christopher Michael <devilho...@comcast.net> Chris Michael
<cp.mich...@samsung.com>
-Christopher Michael <devilho...@comcast.net> Chris Michael
<devilho...@comcast.net>
+Christopher Michael <devilho...@comcast.net> Christopher Michael
<devilho...@comcast.net>
+Christopher Michael <devilho...@comcast.net> Christopher Michael
<cpmich...@osg.samsung.com>
Sebastian Dransfeld <s...@tango.flipp.net> Sebastian Dransfeld
<sebastian.dransf...@sintef.no>
Sebastian Dransfeld <s...@tango.flipp.net> sebastid <sebastid>
Mike Blumenkrantz <michael.blumenkra...@gmail.com> Mike Blumenkrantz
<m.blumenk...@samsung.com>
--
