summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-11-05 12:20:45 -0400
committerGitHub <noreply@github.com>2016-11-05 12:20:45 -0400
commit9589a5afadf1adb766179d6f5d2e94ec742fe696 (patch)
treee43e0713842085b0a095729b0dd9393b87cbfbbb
parent48b59875d2dce31aefb1ce4940ea3848d17108b8 (diff)
parent29164faee3fc91d3c769336e451710289f89b890 (diff)
downloadnumpy-9589a5afadf1adb766179d6f5d2e94ec742fe696.tar.gz
Merge pull request #8182 from charris/update-mailmap
MAINT: Update .mailmap
-rw-r--r--.mailmap6
1 files changed, 5 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index b80816d8d..0f6d7df8c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,7 +18,6 @@ Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffi@ncsu.edu>
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@gmail.com>
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@users.noreply.github.com>
-Alex Nevimov <nevimov@gmail.com> nevimov <nevimov@gmail.com>
Alexander Belopolsky <abalkin@enlnt.com> Alexander Belopolsky <a@enlnt.com>
Alok Singhal <gandalf013@gmail.com> Alok Singhal <gandalf013@gmail.com>
Alok Singhal <gandalf013@gmail.com> Alok Singhal <alok@merfinllc.com>
@@ -63,6 +62,7 @@ Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeier <dhomeie@gwdg
Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeir <derek@astro.phsik.uni-goettingen.de>
Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homier <derek@astro.physik.uni-goettingen.de>
Egor Zindy <ezindy@gmail.com> zindy <ezindy@gmail.com>
+Endolith <endolith@gmail.com>
Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@gmail.com>
Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@linuxlaptop.(none)>
Eric Quintero <eric.antonio.quintero@gmail.com> e-q <eric.antonio.quintero@gmail.com>
@@ -120,6 +120,7 @@ Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
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>
+Matthew Harrigan <harrigan.matthew@gmail.com> MattHarrigan <harrigan.matthew@gmail.com>
Matti Picus <matti.picus@gmail.com> mattip <matti.picus@gmail.com>
Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
Michael Martin <mmartin4242@gmail.com> mmartin <mmartin4242@gmail.com>
@@ -134,6 +135,7 @@ Paul Ivanov <pi@berkeley.edu> Paul Ivanov <paul.ivanov@local>
Paul Jacobson <hpj3@myuw.net> hpaulj <hpj3@myuw.net>
Pearu Peterson <pearu.peterson@gmail.com> Pearu Peterson <pearu@pearu-laptop.(none)>
Peter J Cock <p.j.a.cock@googlemail.com> peterjc <p.j.a.cock@googlemail.com>
+Phil Elson <pelson.pub@gmail.com>
Pierre GM <pierregmcode@gmail.com> pierregm <pierregm@localhost>
Pierre GM <pierregmcode@gmail.com> pierregm <pierregmcode@gmail.com>
Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
@@ -150,6 +152,7 @@ Ryan Blakemore <rbtnet@gmail.com> ryanblak <rbtnet@gmail.com>
Sam Preston <j.sam.preston@gmail.com> jspreston <j.sam.preston@gmail.com>
Sam Radhakrishnan <sk09idm@gmail.com> = <=>
Sam Radhakrishnan <sk09idm@gmail.com> sam09 <sk09idm@gmail.com>
+Saurabh Mehta <e.samehta@gmail.com>
Saullo Giovani <saullogiovani@gmail.com> saullogiovani <saullogiovani@gmail.com>
Sebastian Berg <sebastian@sipsolutions.net> seberg <sebastian@sipsolutions.net>
Shota Kawabuchi <shota.kawabuchi+GitHub@gmail.com> skwbc <shota.kawabuchi+GitHub@gmail.com>
@@ -157,6 +160,7 @@ Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <sjvdwalt@gmail.c
Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <stefan@sun.ac.za>
Stephan Hoyer <shoyer@gmail.com> Stephan Hoyer <shoyer@gmail.com>
Stephan Hoyer <shoyer@gmail.com> Stephan Hoyer <shoyer@climate.com>
+Steven J Kern <kern.steven0@gmail.com>
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
Tim Cera <tim@cerazone.net> tim cera <tcera@sjrwmd.com>