aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd v. Egidy <lists@egidy.de>2012-07-30 10:42:59 +0200
committerEric Blake <eblake@redhat.com>2012-08-01 17:29:46 -0600
commit57fb8d53367c0b6d76b2bcb47d78e1592509ab13 (patch)
tree23698f8e292cf8bae7dbd09b4c8215270176516c /.mailmap
parentgitignore: Reorder alphabetically (diff)
downloadlibvirt-57fb8d53367c0b6d76b2bcb47d78e1592509ab13.tar.gz
libvirt-57fb8d53367c0b6d76b2bcb47d78e1592509ab13.tar.bz2
libvirt-57fb8d53367c0b6d76b2bcb47d78e1592509ab13.zip
maint: consolidate AUTHOR listings for Gerd von Egidy
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 9b0209e3f..38f2d1ac3 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>