From f8861573c24412d3a8a6c8a0d25964708d8f521d Mon Sep 17 00:00:00 2001
From: Luke Inman-Semerau <luke.semerau@gmail.com>
Date: Fri, 21 Oct 2016 13:41:32 -0700
Subject: [PATCH] catching two more duplicate authors [ci skip]

---
 .mailmap | 2 ++
 AUTHORS  | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index a8755c8390807..d5fce4a6a5909 100644
--- a/.mailmap
+++ b/.mailmap
@@ -54,3 +54,5 @@ Titus Fortner <titusfortner@gmail.com> <titus.fortner@blackbaud.com>
 Titus Fortner <titusfortner@gmail.com> <titusfortner@users.noreply.github.com>
 Titus Fortner <titusfortner@gmail.com> <titus.fortner@google.com> 
 Titus Fortner <titusfortner@gmail.com> titusfortner <titusfortner@gmail.com>
+Joshua Grant <joshua.m.grant@gmail.com>
+Michael Tamm <michael.tamm2@gmail.com> <michael.tamm@optivo.de>
diff --git a/AUTHORS b/AUTHORS
index a991276f38c96..687f6a5a24ca2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -179,7 +179,6 @@ Jon Spalding
 Jonah Stiennon <jonahss@gmail.com>
 Jonatan Kronqvist <jonatan@vaadin.com>
 josephg <josephg@gmail.com>
-josh <joshua.m.grant@gmail.com>
 Joshua Bruning <joshbruning@gmail.com>
 Joshua Grant <joshua.m.grant@gmail.com>
 Julian Harty <julianharty@gmail.com>
@@ -221,7 +220,6 @@ Michael Klepikov <klm@google.com>
 Michael P. Jung <michael.jung@terreon.de>
 Michael Tamm <michael.tamm2@gmail.com>
 Michael Zhou <zhoumotongxue008@gmail.com>
-michael.tamm <michael.tamm@optivo.de>
 Michał Herda <phoe@openmailbox.org>
 Michele Sama
 Mike Melia <mikemelia@gmail.com>