Merge pull request #3053 from jsquyres/pr/v2.0.x/mailmap-update

v2.0.x: Sync .mailmap from master, re-generate AUTHORS

Author: jsquyres

.mailmap

@@ -60,6 +60,7 @@ Yohann Burette <[email protected]> <[email protected]>
 Yohann Burette <[email protected]> <[email protected]>
 
 MPI Team (bot) <[email protected]> <[email protected]>
+MPI Team (bot) <[email protected]> <[email protected]>
 MPI Team (bot) <[email protected]> <[email protected]>
 
 Yossi Itigin <[email protected]> <[email protected]>
@@ -98,7 +99,11 @@ Annapurna Dasari <[email protected]> <[email protected]>
 
 L. R. Rajeshnarayanan <[email protected]> <[email protected]>
 
-Aur�lien Bouteiller <[email protected]> <[email protected]>
-Aur�lien Bouteiller <[email protected]> <darter4.nics.utk.edu>
+Aurelien Bouteiller <[email protected]> <[email protected]>
+Aurelien Bouteiller <[email protected]> <darter4.nics.utk.edu>
 
 Alex Mikheev <[email protected]> <[email protected]>
+
+Thomas Naughton <[email protected]> <[email protected]>
+
+Geoffrey Paulsen <[email protected]> <[email protected]>

AUTHORS

@@ -12,8 +12,8 @@ individual who committed them.
 
 Abhishek Kulkarni, Indiana University
   [email protected]
-Aboorva Devarajan
-  [email protected], IBM
+Aboorva Devarajan, IBM
+  [email protected]
 Adrian Knoth, Friedrich-Schiller-Universitat Jena
   [email protected]
 Adrian Reber, Hochschule Esslingen
@@ -39,7 +39,7 @@ Anya Tatashina, Sun
   [email protected]
 Artem Polyakov, Individual, Mellanox
   [email protected]
-Aur�lien Bouteiller, University of Tennessee-Knoxville
+Aurelien Bouteiller, University of Tennessee-Knoxville
   [email protected]
 Avneesh Pant, QLogic
   [email protected]
@@ -96,7 +96,7 @@ Eugene Loh, Sun, Oracle
 Francois WELLENREITER, Individual
   [email protected]
   [email protected]
-Gabriel Pichot
+Gabriel Pichot, Individual
   [email protected]
 Galen Shipman, Los Alamos National Laboratory
   [email protected]
@@ -146,7 +146,7 @@ Jose Roman, Universitat Politecnica de Valencia
 Josh Hursey, Indiana University, Oak Ridge National Laboratory, Los Alamos National Laboratory, Lawrence Berkeley National Laboratory, University of Wisconsin-La Crosse, IBM
   [email protected]
   [email protected]
-Joshua Gerrard
+Joshua Gerrard, Individual
   [email protected]
   [email protected]
 Joshua Ladd, Mellanox
@@ -178,6 +178,8 @@ Mangala Jyothi Bhaskar, University of Houston
   [email protected]
 Manjunath Gorentla Venkata, Oak Ridge National Laboratory
   [email protected]
+Mark Allen, IBM
+  [email protected]
 Mark Santcroos, Rutgers University
   [email protected]
 Mark Taylor, Los Alamos National Laboratory
@@ -253,6 +255,8 @@ Ron Brightwell, Sandia National Laboratory
 Ryan Grant, Sandia National Laboratory
   [email protected]
   [email protected]
+Sameh S. Sharkawi, IBM
+  [email protected]
 Sami Ayyorgun, Los Alamos National Laboratory
   [email protected]
 Samuel Gutierrez, Los Alamos National Laboratory
@@ -285,6 +289,8 @@ Thara Angskun, University of Tennessee-Knoxville
   [email protected]
 Thomas Herault, University of Tennessee-Knoxville
   [email protected]
+Thomas Naughton, Oak Ridge National Laboratory
+  [email protected]
 Tim Mattox, Indiana University, Cisco, Individual
   [email protected]
 Tim Prins, Indiana University, Los Alamos National Laboratory
@@ -294,8 +300,6 @@ Tim Woodall, Los Alamos National Laboratory
 Todd Kordenbrock, Sandia National Laboratory
   [email protected]
   [email protected]
-Tom Naughton, Oak Ridge National Laboratory
-  [email protected]
 Tomislav Janjusic, Mellanox
   [email protected]
 Torsten Hoefler, Indiana University, Technische Universtaet Chemnitz