From 57fb8d53367c0b6d76b2bcb47d78e1592509ab13 Mon Sep 17 00:00:00 2001
From: "Gerd v. Egidy" <lists@egidy.de>
Date: Mon, 30 Jul 2012 10:42:59 +0200
Subject: [PATCH] maint: consolidate AUTHOR listings for Gerd von Egidy

---
 .mailmap | 3 +++
 AUTHORS  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 9b0209e3fd..38f2d1ac3d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,6 +30,8 @@
 <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
 <josh.durgin@inktank.com> <joshd@hq.newdream.net>
 <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
+<gerd@egidy.de> <lists@egidy.de>
+<gerd@egidy.de> <gerd.von.egidy@intra2net.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -37,3 +39,4 @@ Alex Jia <ajia@redhat.com>
 Royce Lv <lvroyce@linux.vnet.ibm.com>
 Daniel J Walsh <dwalsh@redhat.com>
 Ján Tomko <jtomko@redhat.com>
+Gerd von Egidy <gerd@egidy.de>
diff --git a/AUTHORS b/AUTHORS
index 6607a1a9d0..e3eadbf769 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -71,7 +71,7 @@ Patches have also been contributed by:
   Chris Wright         <chrisw@redhat.com>
   Ben Guthro           <ben.guthro@gmail.com>
   Shigeki Sakamoto     <fj0588di@aa.jp.fujitsu.com>
-  Gerd von Egidy       <lists@egidy.de>
+  Gerd von Egidy       <gerd@egidy.de>
   Itamar Heim          <iheim@redhat.com>
   Markus Armbruster    <armbru@redhat.com>
   Ryota Ozaki          <ozaki.ryota@gmail.com>