.mailmap: Update from master

jsquyres · jsquyres · commit fa166bd446b5 · 2017-02-27T16:41:11.000-05:00
Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (manually cherry picked from commits afc49f3 and e6b3be8)
diff --git a/.mailmap b/.mailmap
@@ -60,6 +60,7 @@ Yohann Burette <yohann.burette@intel.com> <yburette@users.noreply.github.com>
 Yohann Burette <yohann.burette@intel.com> <yohann.burette@intel.com>
 
 MPI Team (bot) <mpiteam@open-mpi.org> <mpiteam@open-mpi.org>
+MPI Team (bot) <mpiteam@open-mpi.org> <ompiteam@open-mpi.org>
 MPI Team (bot) <mpiteam@open-mpi.org> <mpiteam@build.open-mpi.org>
 
 Yossi Itigin <yosefe@mellanox.com> <yosefe@mellanox.com>
@@ -98,7 +99,11 @@ Annapurna Dasari <annapurna.dasari@intel.com> <annapurna.dasari@intel.com>
 
 L. R. Rajeshnarayanan <l.r.rajeshnarayanan@intel.com> <l.r.rajeshnarayanan@intel.com>
 
-Aur�lien Bouteiller <bouteill@icl.utk.edu> <bouteill@icl.utk.edu>
-Aur�lien Bouteiller <bouteill@icl.utk.edu> <darter4.nics.utk.edu>
+Aurelien Bouteiller <bouteill@icl.utk.edu> <bouteill@icl.utk.edu>
+Aurelien Bouteiller <bouteill@icl.utk.edu> <darter4.nics.utk.edu>
 
 Alex Mikheev <alexm@mellanox.com> <alexm@mellanox.com>
+
+Thomas Naughton <naughtont@ornl.gov> <naughtont@ornl.gov>
+
+Geoffrey Paulsen <gpaulsen@us.ibm.com> <gpaulsen@users.noreply.github.com>

-Original file line number
+Diff line change
 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]>
 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]>