catching two more duplicate authors [ci skip]

lukeis · lukeis · commit f8861573c244 · 2016-10-21T13:41:32.000-07:00
diff --git 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
@@ -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>

-Original file line number
+Diff line change
 Titus Fortner <[email protected]> <[email protected]>
 Titus Fortner <[email protected]> <[email protected]>
 Titus Fortner <[email protected]> titusfortner <[email protected]>
 +Joshua Grant <[email protected]>
 +Michael Tamm <[email protected]> <[email protected]>
-Original file line number
+Diff line change
 Jonah Stiennon <[email protected]>
 Jonatan Kronqvist <[email protected]>
 josephg <[email protected]>
 -josh <[email protected]>
 Joshua Bruning <[email protected]>
 Joshua Grant <[email protected]>
 Julian Harty <[email protected]>
 Michael P. Jung <[email protected]>
 Michael Tamm <[email protected]>
 Michael Zhou <[email protected]>
 -michael.tamm <[email protected]>
 Michał Herda <[email protected]>
 Michele Sama
 Mike Melia <[email protected]>