From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Wed, 10 Oct 2018 22:29:43 +0000 (+0200)
Subject: mailmap: Fix Reimar Döffinger name
X-Git-Tag: v3.1.0-rc0~49^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=957e8b34920a1404a1318b2e1ffa0726d40e0a9b;p=thirdparty%2Fqemu.git

mailmap: Fix Reimar Döffinger name

This probably happened when interpreting the utf8 name as latin1.

Fixes dbbaaff6867 and f4e94dfefb6.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 2c2b9b12053..6f2ff22a459 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,5 +33,6 @@ Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu
 
 
 # Also list preferred name forms where people have changed their
-# git author config
+# git author config, or having utf8/latin1 encoding issues.
 Daniel P. Berrangé <berrange@redhat.com>
+Reimar Döffinger <Reimar.Doeffinger@gmx.de>