From 0945939cfa13939a0bbbd9a9ea37d91eb7018b62 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Sat, 5 Sep 2015 13:56:01 +0200
Subject: [PATCH] update mailmap

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

diff --git a/.mailmap b/.mailmap
index 266bf43cca..d9d68523c4 100644
--- a/.mailmap
+++ b/.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>