Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-08-19' into staging

[qemu.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 778a4d4e2c70ffa7d7a9b647f9852b515542a762..b8e08297c9096d0e6910e4944e4a569a2d5b3c40 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -12,8 +12,12 @@ Fabrice Bellard <[email protected]> bellard <bellard@c046a42c-6fe2-441c-8c8c-7
 James Hogan <[email protected]> <[email protected]>
 Jocelyn Mayer <[email protected]> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
 Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
-Paul Burton <[email protected]> <[email protected]>
-Paul Burton <[email protected]> <[email protected]>
+Yongbok Kim <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
 Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
@@ -30,5 +34,6 @@ Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel <qemu
 
 
 # Also list preferred name forms where people have changed their
-# git author config
+# git author config, or had utf8/latin1 encoding issues.
 Daniel P. Berrangé <[email protected]>
+Reimar Döffinger <[email protected]>