Merge pull request #4583 from tacaswell/mnt_mailmap

jenshnielsen · jenshnielsen · commit 7a4c36a26eb6 · 2015-07-11T14:43:41.000-05:00
Mnt mailmap
diff --git a/.mailmap b/.mailmap
@@ -1,36 +1,61 @@
-John Hunter <jdh2358@gmail.com> jdh2358 <jdh2358@gmail.com>
-Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>
-Jouni K. Seppänen <jks@iki.fi> Jouni K. Seppänen <jks@iki.fi>
+Andrew Dawson <ajdawson@acm.org> Andrew Dawson <dawson@atm.ox.ac.uk>
+anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
+Ben Cohen <bj.cohen19@gmail.com> Ben Cohen <ben@cohen-family.org>
 Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
-Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
-Kevin Davies <kdavies4@gmail.com> Kevin Davies <daviesk24@yahoo.com>
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
 Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
-anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
+Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
 Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
 Daniel Hyams <dhyams@gmail.com> dhyams <dhyams@gmail.com>
+Eric Dill <thedizzle@gmail.com> Eric Dill <edill@bnl.gov>
+Erik Bray <erik.m.bray@gmail.com> Erik M. Bray <embray@stsci.edu>
 Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
+Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <jakevdp@yahoo.com>
+Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <vanderplas@astro.washington.edu>
 James R. Evans <jrevans1@earthlink.net> James Evans <jrevans1@earthlink.net>
 Jeffrey Bingham <bingjeff@gmail.com> Jeff Bingham <bingjeff@gmail.com>
+Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jens.nielsen@ucl.ac.uk>
-Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
+John Hunter <jdh2358@gmail.com> jdh2358 <jdh2358@gmail.com>
+Jouni K. Seppänen <jks@iki.fi> Jouni K. Seppänen <jks@iki.fi>
 Julien Schueller <julien.schueller@gmail.com> jschueller <schueller@porsche-l64.phimeca.lan>
 Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@bx-l64.phimeca.lan>
 Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@porsche-l64.phimeca.lan>
-Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
+Kevin Davies <kdavies4@gmail.com> Kevin Davies <daviesk24@yahoo.com>
+kikocorreoso <kikocorreoso@gmail.com> kikocorreoso <kikocorreoso@users.noreply.github.com>
+Lennart Fricke <lennart@die-frickes.eu> Lennart Fricke <lennart.fricke@kabelmail.de>
+Levi Kilcher <levi.kilcher@nrel.gov> Levi Kilcher <Levi.Kilcher@nrel.gov>
+Martin Fitzpatrick <martin.fitzpatrick@gmail.com> Martin Fitzpatrick <mfitzp@abl.es>
 Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
+Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>
+Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdboom@debian-vm>
+Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@mad002s-MacBook-Air.local>
+Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
+Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@Michiels-MacBook-Pro.local>
+Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@tkx294.genome.gsc.riken.jp>
 MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
 Nelle Varoquaux <nelle.varoquaux@gmail.com> Varoquaux <nelle.varoquaux@gmail.com>
+Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nic@eggert.pw>
+Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nse23@cornell.edu>
 Nicolas P. Rougier <Nicolas.Rougier@inria.fr> Nicolas Rougier <Nicolas.Rougier@inria.fr>
+Paul Ivanov <pivanov314@gmail.com> Paul Ivanov <pi@berkeley.edu>
 Per Parker <wisalam@live.com> Per <wisalam@live.com>
 Per Parker <wisalam@live.com> solvents <wisalam@live.com>
+Peter Würtz <pwuertz@gmail.com> Peter Würtz <pwuertz@googlemail.com>
 Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@gmail.com>
 Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@googlemail.com>
-Peter Würtz <pwuertz@gmail.com> Peter Würtz <pwuertz@googlemail.com>
+Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
+Phil Elson <pelson.pub@gmail.com> pelson <philipelson@hotmail.com>
 Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@gmail.com>
 Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@hotmail.com>
-Phil Elson <pelson.pub@gmail.com> pelson <philipelson@hotmail.com>
-Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
 Scott Lasley <selasley@me.com> selasley <selasley@me.com>
+sohero <herosgq@gmail.com> sohero <ivip@tom.com>
+switham <github@mac-guyver.com> switham <switham_github@mac-guyver.com>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@uchicago.edu>
+Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <“tcaswell@gmail.com”>
+Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>
+Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20061.(none)>

-Original file line number
+Diff line change
@@ @@ -1,36 +1,61 @@ @@
 -John Hunter <[email protected]> jdh2358 <[email protected]>
 -Michael Droettboom <[email protected]> Michael Droettboom <[email protected]>
 -Jouni K. Seppänen <[email protected]> Jouni K. Seppänen <[email protected]>
 +Andrew Dawson <[email protected]> Andrew Dawson <[email protected]>
 +anykraus <[email protected]> anykraus <[email protected]>
 +Ben Cohen <[email protected]> Ben Cohen <[email protected]>
 Ben Root <[email protected]> Benjamin Root <[email protected]>
 -Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 -Kevin Davies <[email protected]> Kevin Davies <[email protected]>
 Christoph Gohlke <[email protected]> cgohlke <[email protected]>
 Christoph Gohlke <[email protected]> C. Gohlke <[email protected]>
 -anykraus <[email protected]> anykraus <[email protected].com>
 +Cimarron Mittelsteadt <[email protected]> Cimarron <cimarronm@gmail.com>
 Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
 Daniel Hyams <[email protected]> dhyams <[email protected]>
 +Eric Dill <[email protected]> Eric Dill <[email protected]>
 +Erik Bray <[email protected]> Erik M. Bray <[email protected]>
 Francesco Montesano <[email protected]> montefra <[email protected]>
 +Jake Vanderplas <[email protected]> Jake Vanderplas <[email protected]>
 +Jake Vanderplas <[email protected]> Jake Vanderplas <[email protected]>
 James R. Evans <[email protected]> James Evans <[email protected]>
 Jeffrey Bingham <[email protected]> Jeff Bingham <[email protected]>
 +Jens Hedegaard Nielsen <[email protected]> Jens Hedegaard Nielsen <[email protected]>
 Jens Hedegaard Nielsen <[email protected]> Jens H Nielsen <[email protected]>
 Jens Hedegaard Nielsen <[email protected]> Jens H. Nielsen <[email protected]>
 Jens Hedegaard Nielsen <[email protected]> Jens H. Nielsen <[email protected]>
 -Jens Hedegaard Nielsen <[email protected]> Jens Hedegaard Nielsen <[email protected]>
 +John Hunter <[email protected]> jdh2358 <[email protected]>
 +Jouni K. Seppänen <[email protected]> Jouni K. Seppänen <[email protected]>
 Julien Schueller <[email protected]> jschueller <[email protected]>
 Julien Schueller <[email protected]> Julien Schueller <[email protected]>
 Julien Schueller <[email protected]> Julien Schueller <[email protected]>
 -Matthias Bussonnier <[email protected]> Matthias BUSSONNIER <[email protected]>
 +Kevin Davies <[email protected]> Kevin Davies <[email protected]>
 +kikocorreoso <[email protected]> kikocorreoso <[email protected]>
 +Lennart Fricke <[email protected]> Lennart Fricke <[email protected]>
 +Levi Kilcher <[email protected]> Levi Kilcher <[email protected]>
 +Martin Fitzpatrick <[email protected]> Martin Fitzpatrick <[email protected]>
 Matthias Bussonnier <[email protected]> Bussonnier Matthias <[email protected]>
 +Matthias Bussonnier <[email protected]> Matthias BUSSONNIER <[email protected]>
 +Michael Droettboom <[email protected]> Michael Droettboom <[email protected]>
 +Michael Droettboom <[email protected]> Michael Droettboom <mdboom@debian-vm>
 +Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 +Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 +Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 +Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 MinRK <[email protected]> Min RK <[email protected]>
 Nelle Varoquaux <[email protected]> Varoquaux <[email protected]>
 +Nic Eggert <[email protected]> Nic Eggert <[email protected]>
 +Nic Eggert <[email protected]> Nic Eggert <[email protected]>
 Nicolas P. Rougier <[email protected]> Nicolas Rougier <[email protected]>
 +Paul Ivanov <[email protected]> Paul Ivanov <[email protected]>
 Per Parker <[email protected]> Per <[email protected]>
 Per Parker <[email protected]> solvents <[email protected]>
 +Peter Würtz <[email protected]> Peter Würtz <[email protected]>
 Peter Würtz <[email protected]> pwuertz <[email protected]>
 Peter Würtz <[email protected]> pwuertz <[email protected]>
 -Peter Würtz <[email protected]> Peter Würtz <[email protected]>
 +Phil Elson <[email protected]> pelson <[email protected]>
 +Phil Elson <[email protected]> pelson <[email protected]>
 Phil Elson <[email protected]> Phil Elson <[email protected]>
 Phil Elson <[email protected]> Phil Elson <[email protected]>
 -Phil Elson <[email protected]> pelson <[email protected]>
 -Phil Elson <[email protected]> pelson <[email protected]>
 Scott Lasley <[email protected]> selasley <[email protected]>
 +sohero <[email protected]> sohero <[email protected]>
 +switham <[email protected]> switham <[email protected]>
 +Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 +Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 +Thomas A Caswell <[email protected]> Thomas A Caswell <“[email protected]”>
 +Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>
 +Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20061.(none)>