From 341218c6a29f626fc2ad6ef32adce2c8444a12d8 Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann@objoo.org>
Date: Mon, 16 Mar 2015 00:21:15 +0000
Subject: [PATCH] mailmap: Florian Marsylle affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
---
 .mailmap         | 1 +
 .organizationmap | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 36b413852e28e..79e7fb72e80e8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -57,6 +57,7 @@ Feng Wang <cyclonew@cs.ucsc.edu> cyclonew <cyclonew@29311d96-e01e-0410-9327-a35d
 Florent Bautista <florent@coppint.com> FlorentCoppint <florent@coppint.com>
 Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
 Florian Coste <fcoste21@gmail.com> nairolf21
+Florian Marsylle <florian.marsylle@hotmail.fr> <floleblanc@hotmail.fr>
 François Lafont <flafdivers@free.fr> François Lafont <francois.lafont@crdp.ac-versailles.fr>
 Gary Lowell <gary.lowell@inktank.com> Gary Lowelll <gary.lowell@inktank.com>
 Gary Lowell <gary.lowell@inktank.com> <glowell@flab.ops.newdream.net>
diff --git a/.organizationmap b/.organizationmap
index 14590ff3d5259..a1545df6ffc6f 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -261,6 +261,7 @@ Unaffiliated <no@organization.net> Federico Gimenez <fgimenez@coit.es>
 Unaffiliated <no@organization.net> Feng He <fenglife@hotmail.com>
 Unaffiliated <no@organization.net> Florent Bautista <florent@coppint.com>
 Unaffiliated <no@organization.net> Florian Coste <fcoste21@gmail.com>
+Unaffiliated <no@organization.net> Florian Marsylle <florian.marsylle@hotmail.fr>
 Unaffiliated <no@organization.net> François Lafont <flafdivers@free.fr>
 Unaffiliated <no@organization.net> Frank Yu <flyxiaoyu@gmail.com>
 Unaffiliated <no@organization.net> Gaurav Kumar Garg <garg.gaurav52@gmail.com>
-- 
2.39.5