summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS13
2 files changed, 10 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index f223e264..b37295e6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,4 +5,5 @@ Victor Lowther <victor.lowther@gmail.com> <victor.lowther-Re5JQEeQqe8AvxtiuMwx3w
Harald Hoyer <harald@redhat.com> <harald-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Harald Hoyer <harald@redhat.com> <harald@eeepc.(none)>
Mike Snitzer <snitzer@redhat.com> <msnitzer@redhat.com>
+Amerigo Wang <amwang@redhat.com> <xiyou.wangcong@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 32cba353..99eab356 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,25 +2,31 @@ Harald Hoyer <harald@redhat.com>
Victor Lowther <victor.lowther@gmail.com>
Philippe Seewer <philippe.seewer@bfh.ch>
Warren Togami <wtogami@redhat.com>
-Jeremy Katz <katzj@redhat.com>
Amadeusz Żołnowski <aidecoe@aidecoe.name>
+Jeremy Katz <katzj@redhat.com>
David Dillow <dave@thedillows.org>
+Michal Soltys <soltys@ziu.info>
+Will Woods <wwoods@redhat.com>
Andreas Thienemann <andreas@bawue.net>
Hans de Goede <hdegoede@redhat.com>
Peter Jones <pjones@redhat.com>
Luca Berra <bluca@comedia.it>
-Will Woods <wwoods@redhat.com>
Andrey Borzenkov <arvidjaar@mail.ru>
Andrey Borzenkov <arvidjaar@gmail.com>
Marc Grimme <grimme@atix.de>
Daniel Drake <dsd@laptop.org>
+Roberto Sassu <roberto.sassu@polito.it>
+Amerigo Wang <amwang@redhat.com>
Bill Nottingham <notting@redhat.com>
David Cantrell <dcantrell@redhat.com>
Lance Albertson <lance@osuosl.org>
+Marian Ganisin <mganisin@redhat.com>
Michael Ploujnikov <plouj@somanetworks.com>
Alan Jenkins <alan-jenkins@tuffmail.co.uk>
+Alan Pevec <apevec@redhat.com>
Dan Horák <dan@danny.cz>
Joey Boggs <jboggs@redhat.com>
+Jon Ander Hernandez <jonan.h@gmail.com>
Mike Snitzer <snitzer@redhat.com>
Peter Rajnoha <prajnoha@redhat.com>
Vladislav Bogdanov <bubble@hoster-ok.com>
@@ -33,19 +39,18 @@ Frederic Crozat <fcrozat@mandriva.com>
Glen Gray <slaine@slaine.org>
Ian Dall <ian@beware.dropbear.id.au>
James Laska <jlaska@redhat.com>
-Jon Ander Hernandez <jonan.h@gmail.com>
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Lubomir Rintel <lkundrak@v3.sk>
Luca Berra <bluca@vodka.it>
Matt <smoothsailing72@hotmail.com>
Matt Smith <shadowfax@gmx.com>
Michal Schmidt <mschmidt@redhat.com>
-Michal Soltys <soltys@ziu.info>
Munehiro Matsuda <haro@kgt.co.jp>
Pádraig Brady <P@draigBrady.com>
Quentin Armitage <quentin@armitage.org.uk>
Sergey Fionov <fionov@gmail.com>
Thilo Bangert <thilo.bangert@gmx.net>
+Thomas Lange <lange@informatik.uni-koeln.de>
Tomasz Torcz <tomek@pipebreaker.pl>
Vadim Kuznetsov <vadimk@gentoo.org>
Ville Skyttä <ville.skytta@iki.fi>