summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2017-01-15 17:16:42 -0700
committerCharles Harris <charlesr.harris@gmail.com>2017-01-15 17:48:37 -0700
commitfdbaece7ff06959060d5c10a0e23ecc957b9ff69 (patch)
treec73f78ff5f1004838194d16ef04c8d69a98e81b1 /.mailmap
parentd9c1a1f91a3983469de7086ff589a6aeaa353b3e (diff)
downloadpython-numpy-fdbaece7ff06959060d5c10a0e23ecc957b9ff69.tar.gz
python-numpy-fdbaece7ff06959060d5c10a0e23ecc957b9ff69.tar.bz2
python-numpy-fdbaece7ff06959060d5c10a0e23ecc957b9ff69.zip
MAINT: Forward port accumulated changes from the 1.12.0 release.
The following files were updated during the NumPy 1.12.0 release - .mailmap - doc/release/1.12.0-notes.rst - tools/announce.py - pavement.py and are forward ported to master by this PR. [ci skip]
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e2a9adbaa..02b9db533 100644
--- 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>