Merge pull request #8466 from charris/update-mailmap

charris · web-flow · commit 93141b7ed40a · 2017-01-10T16:33:10.000-07:00
MAINT: Update mailmap entries.
diff --git a/.mailmap b/.mailmap
@@ -66,6 +66,7 @@ Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeni@burovski.me
 Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com>
 Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org>
 Friedrich Dunne <dunneff@tcd.ie> dunneff <dunneff@tcd.ie>
+Frederic Bastien <nouiz@nouiz.org> Frederic <nouiz@nouiz.org>
 Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
 Gerrit Holl <gerrit.holl@utoronto.ca> Gerrit Holl <g.holl@reading.ac.uk>
 Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com>
diff --git a/doc/release/1.12.0-notes.rst b/doc/release/1.12.0-notes.rst
@@ -539,7 +539,7 @@ names contributed a patch for the first time.
 * Eric Quintero +
 * Eric Wieser +
 * Erik M. Bray
-* Frederic Bastien +
+* Frederic Bastien
 * Friedrich Dunne +
 * Gerrit Holl
 * Golnaz Irannejad +
