From 58a17a740ec8e814ea3ee865f7b56bf442ce8383 Mon Sep 17 00:00:00 2001
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: Mon, 22 Sep 2014 16:25:23 -0700
Subject: [PATCH] Fix mailmap entries for @jasongrout and @SylvainCorlay

---
 .mailmap | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0150e5a54..b8a599189 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,7 +52,8 @@ Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <vanderplas@astro.washington
 Jakob Gager <jakob.gager@gmail.com> jakobgager <jakob.gager@gmail.com>
 Jakob Gager <jakob.gager@gmail.com> jakobgager <gager@ilsb.tuwien.ac.at>
 Jakob Gager <jakob.gager@gmail.com> jakobgager <jakobgager@hotmail.com>
-Jason Grout <jason.grout@drake.edu> Jason Grout <jason-github@creativetrax.com>
+Jason Grout <jgrout6@bloomberg.net> <jason.grout@drake.edu>
+Jason Grout <jgrout6@bloomberg.net> <jason-github@creativetrax.com>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jhn@jhn-Znote.(none)>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
@@ -111,6 +112,8 @@ Steven Johnson <steven.johnson@drake.edu> stevenJohnson <steven.johnson@drake.ed
 Steven Silvester <steven.silvester@ieee.org> blink1073 <steven.silvester@ieee.org>
 S. Weber <s8weber@c4.usr.sh> s8weber <s8weber@c5.usr.sh>
 Stefan van der Walt <stefan@sun.ac.za> Stefan van der Walt <bzr@mentat.za.net>
+Sylvain Corlay <scorlay@bloomberg.net> <sylvain.corlay@gmail.com>
+Sylvain Corlay <scorlay@bloomberg.net> sylvain.corlay <sylvain.corlay@gmail.com>
 Ted Drain <ted.drain@gmail.com> TD22057 <ted.drain@gmail.com>
 Théophile Studer <theo.studer@gmail.com> Théophile Studer <studer@users.noreply.github.com>
 Thomas Kluyver <takowl@gmail.com> Thomas <takowl@gmail.com>
@@ -127,4 +130,4 @@ Ville M. Vainio <vivainio@gmail.com> Ville M. Vainio <vivainio@ville_vmw>
 Walter Doerwald <walter@livinglogic.de> walter.doerwald <>
 Walter Doerwald <walter@livinglogic.de> Walter Doerwald <>
 W. Trevor King <wking@tremily.us> W. Trevor King <wking@drexel.edu>
-Yoval P. <yoval@gmx.com> y-p <yoval@gmx.com>
\ No newline at end of file
+Yoval P. <yoval@gmx.com> y-p <yoval@gmx.com>