2011-09-20 02:34:10 +04:00
# 'git shortlog --help' and look for mailmap for the format of each line
# Email consolidation:
2011-04-21 03:00:30 +04:00
# <Preferred address in AUTHORS> <other alias used by same author>
2010-05-28 13:27:12 +04:00
<amy.griffis@hp.com> <aron.griffis@hp.com>
<bozzolan@gmail.com> <redshift@gmx.com>
<charles_duffy@messageone.com> <charles@dyfis.net>
<dfj@redhat.com> <dfj@dfj.bne.redhat.com>
<eblake@redhat.com> <ebb9@byu.net>
<gdolley@arpnetworks.com> <gdolley@ucla.edu>
<gerhard.stenzel@de.ibm.com> <gstenzel@linux.vnet.ibm.com>
<jamie@canonical.com> <jamie@ubuntu.com>
<laine@redhat.com> <laine@laine.org>
<meyering@redhat.com> <jim@meyering.net>
<socketpair@gmail.com> <socketpair gmail com>
2010-08-10 18:13:22 +04:00
<soren@linux2go.dk> <soren@ubuntu.com>
2011-09-02 02:13:34 +04:00
<jfehlig@suse.com> <jfehlig@novell.com>
<jfehlig@suse.com> <jfehlig@linux-ypgk.site>
2010-07-09 13:35:39 +04:00
<jclift@redhat.com> <justin@salasaga.org>
2010-07-23 13:43:45 +04:00
<berrange@redhat.com> <dan@berrange.com>
2010-08-10 18:13:22 +04:00
<soren@linux2go.dk> <soren@canonical.com>
2011-04-14 13:22:35 +04:00
<cfergeau@redhat.com> <teuf@gnome.org>
2011-04-21 03:00:30 +04:00
<wency@cn.fujitsu.com> <wency cn fujitsu com>
2011-05-21 00:18:09 +04:00
<cardoe@cardoe.com> <cardoe@gentoo.org>
2011-05-13 14:11:47 +04:00
<fsimonce@redhat.com> <federico.simoncelli@gmail.com>
2011-06-14 15:35:48 +04:00
<marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
2011-06-30 12:22:20 +04:00
<supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
2011-10-03 13:58:55 +04:00
<neil@aldur.co.uk> <neil@brightbox.co.uk>
2011-11-11 19:22:23 +04:00
<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
2012-08-10 01:31:58 +04:00
<stefanb@us.ibm.com> <stefannb@linux.vnet.ibm.com>
2012-07-02 22:55:26 +04:00
<josh.durgin@inktank.com> <joshd@hq.newdream.net>
<josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
2012-07-30 12:42:59 +04:00
<gerd@egidy.de> <lists@egidy.de>
<gerd@egidy.de> <gerd.von.egidy@intra2net.com>
2011-09-20 02:34:10 +04:00
# Name consolidation:
# Preferred author spelling <preferred email>
Alex Jia <ajia@redhat.com>
2012-07-09 22:08:52 +04:00
Royce Lv <lvroyce@linux.vnet.ibm.com>
2012-07-19 01:34:53 +04:00
Daniel J Walsh <dwalsh@redhat.com>
2012-07-26 18:05:51 +04:00
Ján Tomko <jtomko@redhat.com>
2012-07-30 12:42:59 +04:00
Gerd von Egidy <gerd@egidy.de>