2011-09-19 16:34:10 -06:00
# 'git shortlog --help' and look for mailmap for the format of each line
# Email consolidation:
2011-04-20 17:00:30 -06:00
# <Preferred address in AUTHORS> <other alias used by same author>
2010-05-28 11:27:12 +02: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 08:13:22 -06:00
<soren@linux2go.dk> <soren@ubuntu.com>
2011-09-01 16:13:34 -06:00
<jfehlig@suse.com> <jfehlig@novell.com>
<jfehlig@suse.com> <jfehlig@linux-ypgk.site>
2010-07-09 19:35:39 +10:00
<jclift@redhat.com> <justin@salasaga.org>
2010-07-23 10:43:45 +01:00
<berrange@redhat.com> <dan@berrange.com>
2010-08-10 08:13:22 -06:00
<soren@linux2go.dk> <soren@canonical.com>
2011-04-14 11:22:35 +02:00
<cfergeau@redhat.com> <teuf@gnome.org>
2011-04-20 17:00:30 -06:00
<wency@cn.fujitsu.com> <wency cn fujitsu com>
2011-05-20 15:18:09 -05:00
<cardoe@cardoe.com> <cardoe@gentoo.org>
2011-05-13 06:11:47 -04:00
<fsimonce@redhat.com> <federico.simoncelli@gmail.com>
2011-06-14 13:35:48 +02:00
<marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
2011-06-30 13:52:20 +05:30
<supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
2011-10-03 10:58:55 +01:00
<neil@aldur.co.uk> <neil@brightbox.co.uk>
2011-11-11 08:22:23 -07:00
<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
2012-02-03 09:56:45 -07:00
<josh.durgin@dreamhost.com> <joshd@hq.newdream.net>
2011-09-19 16:34:10 -06:00
# Name consolidation:
# Preferred author spelling <preferred email>
Alex Jia <ajia@redhat.com>