From: Boris Faure <billiob@gmail.com>
Date: Sat, 5 Sep 2015 11:55:22 +0000 (+0200)
Subject: update mailmap
X-Git-Tag: upstream/1.20.0~7116^2~14^2~672
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c53106db27706c599ef3a945f85ccf22124825db;p=platform%2Fupstream%2Fefl.git

update mailmap
---

diff --git a/legacy/elementary/.mailmap b/legacy/elementary/.mailmap
index 266bf43..d9d6852 100644
--- a/legacy/elementary/.mailmap
+++ b/legacy/elementary/.mailmap
@@ -27,6 +27,7 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkr
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> discomfitor <michael.blumenkrantz@gmail.com>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> zmike <michael.blumenkrantz@gmail.com>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@samsung.com>
+Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@osg.samsung.com>
 ChunEon Park <hermet@hermet.pe.kr> ChunEon Park <chuneon.park@samsung.com>
 David Walter Seikel <onefang@gmail.com> David Walter Seikel <won_fang@yahoo.com.au>
 Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@intel.com>
@@ -75,3 +76,7 @@ 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>
+Lee Gwang-O <maeryo@live.co.kr> Gwang O Lee <pu8046@gmail.com>
+Thibaut Broggi <broggi_t@epitech.eu> broggi_t <broggi_t@epitech.eu>
+Daniel Zaoui <daniel.zaoui@samsung.com> Daniel Zaoui <daniel.zaoui@yahoo.com>
+Jérémy Anger <angerj.dev@gmail.com> kidanger <angerj.dev@gmail.com>