Merge remote-tracking branch 'remotes/rth/tags/pull-dis-20171026' into staging

[qemu.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 7b91a95d95d045bfb25ad8608d944e5b9e266b4d..28defa1b2c575bd4e5a958081bd05d6929f5a007 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@
 #
 Andrzej Zaborowski <[email protected]> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
 Anthony Liguori <[email protected]> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
+Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
 Aurelien Jarno <[email protected]> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
 Blue Swirl <[email protected]> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
 Edgar E. Iglesias <[email protected]> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>