From 746b082de7d762274c281c9d3fe6b343f97418a9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 Sep 2018 15:32:46 +0200
Subject: [PATCH] =?UTF-8?q?Normalize=20email=20address=20for=20Fr=C3=A9d?=
 =?UTF-8?q?=C3=A9ric=20Bron?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recognize Frédéric as author of commits done with 2 different email
addresses.
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b5150753e7..3a58332ba7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Cătălin Răceanu							<maildus@gmail.com>
 			<maildus@gmail.com>			<catalinr@users.noreply.github.com>
 Danny Scott		<doscott@doscott.ca>			<doscott@gmail.com>
 Dimitri Schoolwerth	<dimitri.schoolwerth@gmail.com>		<dimitri@schoolwerth.com>
+Frédéric Bron		<frederic.bron@m4x.org>			<ufospoke@gmail.com>
 Hubert Talbot							<hubert.talbot64@gmail.com>
 Ilya Bizyaev							<bizyaev.game@yandex.ru>
 John Roberts		<johnr@iinet.net.au>			<johnr@jjbone.com>