From: Eric Blake <eblake@redhat.com>
Date: Mon, 6 Oct 2014 14:23:47 +0000 (-0600)
Subject: maint: update .mailmap
X-Git-Tag: v1.2.10-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d31c0487c0b2ec4f21ada489041e73658ef8d53;p=thirdparty%2Flibvirt.git

maint: update .mailmap

Consolidate several commits made by James:
https://www.redhat.com/archives/libvir-list/2014-September/msg01156.html

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index c430200ebe..826c63c934 100644
--- a/.mailmap
+++ b/.mailmap
@@ -56,3 +56,4 @@ Philipp Hahn <hahn@univention.de>
 Marco Bozzolan <bozzolan@gmail.com>
 Marco Bozzolan <redshift@gmx.com>
 Pritesh Kothari <pritesh.kothari@sun.com>
+Wang Yufei (James) <james.wangyufei@huawei.com>