From 371c9f97b2b1c9490623e29b77c441e563e02b95 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Tue, 27 Feb 2018 21:48:34 +0000
Subject: [PATCH] Update AUTHORS

Also tweak .mailmap to dedup w9n and fix Alice Frosi's email address

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 .mailmap | 2 ++
 AUTHORS  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 1a666bd07..7e1732767 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@
 #
 # For explanation on this file format: man git-shortlog
 
+Alice Frosi <alice@linux.vnet.ibm.com> <alice@linux.vnet.ibm.comx>
 Amir Chaudhry <amir.chaudhry@docker.com> <amirmc@gmail.com>
 Anil Madhavapeddy <anil.madhavapeddy@docker.com> <anil@recoil.org>
 Dan Finneran <dan@thebsdbox.co.uk> <dan@dev.fnnrn.me>
@@ -42,6 +43,7 @@ Pierre Gayvallet <pierre.gayvallet@docker.com> <pierre.gayvallet@gmail.com>
 Radu Matei <matei.radu94@gmail.com>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
+Robin Winkelewski <w9ncontact@gmail.com>
 Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com>
 Rolf Neugebauer <rolf.neugebauer@docker.com> <rn@users.noreply.github.com>
 Rolf Neugebauer <rolf.neugebauer@docker.com> <rolf.neugebauer@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 25e64da08..8cef7b344 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@
 Ajeet Singh Raina, Docker Captain, {Code} Catalysts, Dell EMC R&D <ajeetraina@gmail.com>
 Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 Alex Johnson <hello@alex-johnson.net>
+Alice Frosi <alice@linux.vnet.ibm.com>
 Amir Chaudhry <amir.chaudhry@docker.com>
 Anil Madhavapeddy <anil.madhavapeddy@docker.com>
 Avi Deitcher <avi@deitcher.net>
@@ -28,6 +29,8 @@ Edward Vielmetti <edward.vielmetti@gmail.com>
 Emily Casey <ecasey@pivotal.io>
 Eric Briand <eric.briand@gmail.com>
 French Ben <frenchben@docker.com>
+functor <meehow@gmail.com>
+Garth Bushell <garth.bushell@oracle.com>
 George Papanikolaou <g3orge.app@gmail.com>
 Gianluca Arbezzano <gianarb92@gmail.com>
 Guillaume Rose <guillaume.rose@docker.com>
@@ -68,6 +71,7 @@ Nathan LeClaire <nathan.leclaire@docker.com>
 Nick Jones <nick@dischord.org>
 Niclas Mietz <niclas@mietz.io>
 Nico Di Rocco <dirocco.nico@gmail.com>
+Olaf Bergner <olaf.bergner@gmx.de>
 Olaf Flebbe <of@oflebbe.de>
 Phil Estes <estesp@linux.vnet.ibm.com>
 Pierre Gayvallet <pierre.gayvallet@docker.com>
@@ -98,6 +102,5 @@ Tim Potter <tpot@hpe.com>
 Tobias Klauser <tklauser@distanz.ch>
 Tycho Andersen <tycho@docker.com>
 Vincent Demeester <Vincent.Demeester@docker.com>
-w9n <w9ncontact@gmail.com>
 Zachery Hostens <zacheryph@gmail.com>
 zlim <zlim.lnx@gmail.com>