From 1d597e0bedb8228ce4d5cb2a321c83556ce6c1bf Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Mon, 27 Feb 2017 16:18:13 -0500
Subject: [PATCH 1/2] .mailmap: Remove accent from Aurelein's name

This was per request of Aurelein.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit afc49f3361afe7d9bfeaddf489892c062eff7fc2)
---
 .mailmap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index c296874e490..7bb958c34a9 100644
--- 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>

From ef0276758e0b775c7aab5709ca83d2156915dce8 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Mon, 27 Feb 2017 16:40:23 -0500
Subject: [PATCH 2/2] AUTHORS: Re-run contrib/dist/make-authors.pl

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 7935915754c..d70d4127bc7 100644
--- 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