diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-21 09:24:28 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-21 09:24:28 -0700 |
commit | 62942fbc078d4e1af8728ecbb0120effdde5c9d2 (patch) | |
tree | 88f82a9e19a8805a85d9be6b9df6c17f98a48751 | |
parent | 9ad54ae775a2e828907556f4fa30ade8780b8bf6 (diff) | |
parent | 7e4baa91982f1f0901f4133a389438a0ca048544 (diff) | |
download | numpy-62942fbc078d4e1af8728ecbb0120effdde5c9d2.tar.gz |
Merge pull request #7076 from charris/update-mailmap
MAINT: Update the git .mailmap file.
-rw-r--r-- | .mailmap | 28 |
1 files changed, 28 insertions, 0 deletions
@@ -10,16 +10,23 @@ Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost> Abdul Muneer <abdulmuneer@gmail.com> abdulmuneer <abdulmuneer@gmail.com> +Adam Ginsburg <adam.g.ginsburg@gmail.com> Adam Ginsburg <adam.g.ginsburg@gmail.com> +Adam Ginsburg <adam.g.ginsburg@gmail.com> Adam Ginsburg <keflavich@gmail.com> Albert Jornet Puig <albert.jornet@ic3.cat> jurnix <albert.jornet@ic3.cat> 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> 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> Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.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> 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 <?@?> @@ -28,10 +35,13 @@ Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@Laptop-3.local> Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@laptop.local> Carl Kleffner <cmkleffner@gmail.com> carlkl <cmkleffner@gmail.com> Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost> +Chris Kerr <debdepba@dasganma.tk> Chris Kerr <debdepba@dasganma.tk> +Chris Kerr <debdepba@dasganma.tk> Chris Kerr <cjk34@cam.ac.uk> Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu> Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?> Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu> Christopher Hanley <chanley@gmail.com> chanley <chanley@gmail.com> +Daniel <dabi@blazemail.com> Daniel <dabi@blazemail.com> Daniel J Farrell <danieljfarrel@me.com> danieljfarrell <danieljfarrel@me.com> Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> Daniel <muellner@localhost.localdomain> Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> dmuellner <Daniel Müllner muellner@math.stanford.edu> @@ -44,11 +54,25 @@ 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> +Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@gmail.com> +Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@linuxlaptop.(none)> Ernest N. Mamikonyan <ernest.mamikonyan@gmail.com> mamikony <ernest.mamikonyan@sig.com> +Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeny.burovskiy@gmail.com> +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> Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org> +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> +Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung17@gmail.com> +Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung@mit.edu> +Jason Grout <jason-github@creativetrax.com> Jason Grout <jason-github@creativetrax.com> +Jason Grout <jason-github@creativetrax.com> Jason Grout <jason.grout@drake.edu> +Joseph Martinot-Lagarde <contrebasse@gmail.com> Joseph Martinot-Lagarde <contrebasse@gmail.com> +Joseph Martinot-Lagarde <contrebasse@gmail.com> Joseph Martinot-Lagarde <joseph.martinot-lagarde@onera.fr> +Julien Lhermitte <jrmlhermitte@gmail.com> Julien Lhermitte <jrmlhermitte@gmail.com> +Julien Lhermitte <jrmlhermitte@gmail.com> Julien Lhermitte <lhermitte@bnl.gov> 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> @@ -90,6 +114,8 @@ Ralf Gommers <ralf.gommers@gmail.com> rgommers <ralf.gommers@googlemail.com> Ritta Narita <narittan@gmail.com> RittaNarita <narittan@gmail.com> Robert Kern <rkern@enthought.com> Robert Kern <robert.kern@gmail.com> Robert LU <robberphex@gmail.com> RobberPhex <robberphex@gmail.com> +Ronan Lamy <ronan.lamy@gmail.com> Ronan Lamy <ronan.lamy@gmail.com> +Ronan Lamy <ronan.lamy@gmail.com> Ronan Lamy <Ronan.Lamy@normalesup.org> Russell Hewett <rhewett@mit.edu> rhewett <rhewett@mit.edu> Ryan Blakemore <rbtnet@gmail.com> ryanblak <rbtnet@gmail.com> Sam Preston <j.sam.preston@gmail.com> jspreston <j.sam.preston@gmail.com> @@ -97,6 +123,8 @@ Saullo Giovani <saullogiovani@gmail.com> saullogiovani <saullogiovani@gmail.com> Sebastian Berg <sebastian@sipsolutions.net> seberg <sebastian@sipsolutions.net> Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <sjvdwalt@gmail.com> 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> 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> |