Merge pull request #3054 from jsquyres/pr/v2.1.0/mailmap-update

jsquyres · web-flow · commit cd6227c587a1 · 2017-02-28T06:52:50.000-05:00
v2.1.0: Sync .mailmap from master, re-generate AUTHORS
diff --git a/.mailmap b/.mailmap
@@ -98,7 +98,7 @@ 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>
diff --git a/AUTHORS b/AUTHORS
@@ -41,7 +41,7 @@ Anya Tatashina, Sun
   anya.tatashina@sun.com
 Artem Polyakov, Individual, Mellanox
   artpol84@gmail.com
-Aur�lien Bouteiller, University of Tennessee-Knoxville
+Aurelien Bouteiller, University of Tennessee-Knoxville
   bouteill@icl.utk.edu
 Avneesh Pant, QLogic
   avneesh.pant@qlogic.com

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