From 3beefd7e5fb9ac3a46253cb73ca0317c62073a20 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Oct 2018 19:03:42 +0200
Subject: [PATCH] Standardize Tim Stahlhut name and email in git-log

Extend .mailmap entry to cover all combinations and use the preferred
email.

See https://github.com/wxWidgets/wxWidgets/pull/981
---
 .mailmap | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 3754838473..79a840e34a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,7 +32,9 @@ Richard Fath							<richard.fath@t-online.de>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 			<swbrowne@gmail.com>			<amn3sia@gmail.com>
 Tim Kosse		<tim.kosse@gmx.de>			<tim.kosse@filezilla-project.org>
-Tim Stahlhut		<stahta01@users.sourceforge.net>	<stahta01@users.noreply.github.com>
+Tim Stahlhut		<stahta01@gmail.com>
+Tim Stahlhut		<stahta01@gmail.com>			<stahta01@users.sourceforge.net>
+Tim Stahlhut		<stahta01@gmail.com>			<stahta01@users.noreply.github.com>
 Tobias Taschner		<ttaschner@protect-software.com>	<TcT2k@users.noreply.github.com>
 			<ttaschner@protect-software.com>	<github@tc84.de>
 Václav Slavík		<vaclav@slavik.io>			<vslavik@fastmail.fm>