Merge pull request matplotlib#3422 from jenshnielsen/use_mailmap

tacaswell · tacaswell · commit 7794c30cb99b · 2014-09-02T15:17:26.000-04:00
DOC : Use mailmap in github stats
diff --git a/.mailmap b/.mailmap
@@ -5,3 +5,32 @@ 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>
+Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
+Daniel Hyams <dhyams@gmail.com> dhyams <dhyams@gmail.com>
+Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
+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 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>
+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>
+Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
+MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
+Nelle Varoquaux <nelle.varoquaux@gmail.com> Varoquaux <nelle.varoquaux@gmail.com>
+Nicolas P. Rougier <Nicolas.Rougier@inria.fr> Nicolas Rougier <Nicolas.Rougier@inria.fr>
+Per Parker <wisalam@live.com> Per <wisalam@live.com>
+Per Parker <wisalam@live.com> solvents <wisalam@live.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> 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>

-Original file line number
+Diff line change
 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]>
 +Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
 +Daniel Hyams <[email protected]> dhyams <[email protected]>
 +Francesco Montesano <[email protected]> montefra <[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 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]>
 +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]>
 +Matthias Bussonnier <[email protected]> Bussonnier Matthias <[email protected]>
 +MinRK <[email protected]> Min RK <[email protected]>
 +Nelle Varoquaux <[email protected]> Varoquaux <[email protected]>
 +Nicolas P. Rougier <[email protected]> Nicolas Rougier <[email protected]>
 +Per Parker <[email protected]> Per <[email protected]>
 +Per Parker <[email protected]> solvents <[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]> 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]>