summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-03-28 09:11:24 -0600
committerCharles Harris <charlesr.harris@gmail.com>2016-03-28 09:11:24 -0600
commit10e461be85d35834be50396feda8e96b0c6ef3b9 (patch)
treeac8290d5aa11e5e97b7bd16a84b9fba85082ec7c
parent1618f7c3e8a8583d62a23cb6b6b37584dad4f849 (diff)
downloadpython-numpy-10e461be85d35834be50396feda8e96b0c6ef3b9.tar.gz
python-numpy-10e461be85d35834be50396feda8e96b0c6ef3b9.tar.bz2
python-numpy-10e461be85d35834be50396feda8e96b0c6ef3b9.zip
MAINT: Yet more .mailmap updates for recent contributors.
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index bdd6aac01..96c3957ce 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,12 +23,14 @@ Alok Singhal <gandalf013@gmail.com> Alok Singhal <gandalf013@gmail.com>
Alok Singhal <gandalf013@gmail.com> Alok Singhal <alok@merfinllc.com>
Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.com>
Anatoly Techtonik <techtonik@gmail.com> anatoly techtonik <techtonik@gmail.com>
+Andrei Kucharavy <ank@andreikucharavy.com> chiffa <ank@andreikucharavy.com>
Anne Archibald <peridot.faceted@gmail.com> aarchiba <peridot.faceted@gmail.com>
Anne Archibald <peridot.faceted@gmail.com> Anne Archibald <archibald@astron.nl>
Anže Starič <anze.staric@gmail.com> astaric <anze.staric@gmail.com>
Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
Arun Persaud <apersaud@lbl.gov> Arun Persaud <apersaud@lbl.gov>
Arun Persaud <apersaud@lbl.gov> Arun Persaud <arun@nubati.net>
+Auke Wiggers <wiggers.auke@gmail.com> auke <wiggers.auke@gmail.com>
Behzad Nouri <behzadnouri@gmail.com> behzad nouri <behzadnouri@gmail.com>
Benjamin Root <ben.v.root@gmail.com> Ben Root <ben.v.root@gmail.com>
Benjamin Root <ben.v.root@gmail.com> weathergod <?@?>
@@ -69,7 +71,9 @@ Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@nor
Gerrit Holl <g.holl@reading.ac.uk> Gerrit Holl <g.holl@reading.ac.uk>
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>
+Golnaz Irannejad <golnazirannejad@gmail.com> golnazir <golnazirannejad@gmail.com>
Gopal Singh Meena <gopalmeena94@gmail.com> gopalmeena <gopalmeena94@gmail.com>
+Greg Knoll <gregory@bccn-berlin.de> gkBCCN <gregory@bccn-berlin.de>
Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung17@gmail.com>
Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung@mit.edu>
Greg Yang <sorcererofdm@gmail.com> eulerreich <sorcererofdm@gmail.com>
@@ -85,6 +89,7 @@ Han Genuit <hangenuit@gmail.com> 87 <hangenuit@gmail.com>
Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
Han Genuit <hangenuit@gmail.com> hangenuit@gmail.com <hangenuit@gmail.com>
Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
+Irvin Probst <irvin.probst@ensta-bretagne.fr> I--P <irvin.probst@ensta-bretagne.fr>
Jaime Fernandez <jaime.frio@gmail.com> Jaime <jaime.frio@gmail.com>
Jaime Fernandez <jaime.frio@gmail.com> Jaime Fernandez <jaime.fernandez@hp.com>
Jaime Fernandez <jaime.frio@gmail.com> jaimefrio <jaime.frio@gmail.com>
@@ -109,6 +114,7 @@ Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
+Michael Martin <mmartin4242@gmail.com> mmartin <mmartin4242@gmail.com>
Michael K. Tran <trankmichael@gmail.com> mtran <trankmichael@gmail.com>
Michael Behrisch <oss@behrisch.de> behrisch <behrisch@users.sourceforge.net>
Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>