Add some new entries to .mailmap.

QuLogic · QuLogic · commit 53603be1928f · 2016-10-01T16:41:54.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -1,4 +1,7 @@
+Adam Ortiz <adam.ortiz@utoronto.ca>
+
 Adrien F. Vincent <vincent.adrien@gmail.com>
+Adrien F. Vincent <vincent.adrien@gmail.com> <adrien.vincent@u-psud.fr>
 
 Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
 
@@ -10,18 +13,25 @@ Ben Cohen <bj.cohen19@gmail.com> <ben@cohen-family.org>
 
 Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
 
+Benjamin Congdon <bencongdon96@gmail.com>
+Benjamin Congdon <bencongdon96@gmail.com> bcongdon <bcongdo2@illinois.edu>
+
 Casper van der Wel <caspervdw@gmail.com>
 
 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
 Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
 
 Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
 
+DanHickstein <danhickstein@gmail.com>
+
 Daniel Hyams <dhyams@gmail.com>
 Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
 
 David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
 
+Devashish Deshpande <ashu.9412@gmail.com>
+
 endolith <endolith@gmail.com>
 
 Eric Dill <thedizzle@gmail.com> <edill@bnl.gov>
@@ -31,8 +41,20 @@ Erik Bray <erik.m.bray@gmail.com> <embray@stsci.edu>
 Eric Ma <ericmajinglong@gmail.com> <ericmjl@Erics-MacBook-Pro.local>
 Eric Ma <ericmajinglong@gmail.com> <ericmjl@users.noreply.github.com>
 
+Filipe <ocefpaf@gmail.com>
+
+Florian LB <florian.s.lebourdais@gmail.com>
+
 Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
 
+hannah <story645@gmail.com>
+
+Hans Moritz Günther <moritz.guenther@gmx.de>
+
+J. Goutin <JGoutin@users.noreply.github.com> JGoutin <ginnungagap@free.fr>
+
+Jack Kelly <jack-list@xlk.org.uk> Jack (aka Daniel) Kelly <daniel.kelly10@imperial.ac.uk>
+
 Jaime Fernandez <jaime.frio@gmail.com>
 
 Jake Vanderplas <jakevdp@gmail.com>
@@ -64,19 +86,29 @@ Kevin Davies <kdavies4@gmail.com> <daviesk24@yahoo.com>
 
 kikocorreoso <kikocorreoso@gmail.com> <kikocorreoso@users.noreply.github.com>
 
+Klara Gerlei <klarizsofi@gmail.com>
+Klara Gerlei <klarizsofi@gmail.com> klaragerlei <s1466507@sms.ed.ac.uk>
+
+Kristen M. Thyng <kthyng@gmail.com>
+
 Leeonadoh <leo.sunpeng.li@gmail.com>
 
 Lennart Fricke <lennart@die-frickes.eu> <lennart.fricke@kabelmail.de>
 
 Levi Kilcher <levi.kilcher@nrel.gov>
 
+Lion Krischer <krischer@geophysik.uni-muenchen.de>
+
 Martin Fitzpatrick <martin.fitzpatrick@gmail.com> <mfitzp@abl.es>
 
 Matthew Emmett <memmett@gmail.com>
 Matthew Emmett <memmett@gmail.com> <memmett@unc.edu>
 
 Matthias Bussonnier <bussonniermatthias@gmail.com>
 
+matthias <maluethi@protonmail.ch>
+matthias <maluethi@protonmail.ch> <matthias.luethi@lhep.unibe.ch>
+
 Michael Droettboom <mdboom@gmail.com> <mdroe@stsci.edu>
 Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdboom@debian-vm>
 
@@ -89,6 +121,8 @@ Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@tkx294.genome.gsc
 MinRK <benjaminrk@gmail.com>
 MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
 
+Moritz Beyreuther <random.seed@web.de>
+
 Nelle Varoquaux <nelle.varoquaux@gmail.com>
 
 Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nic@eggert.pw>
@@ -100,6 +134,9 @@ OceanWolf <juichenieder-tigger@yahoo.co.uk>
 
 Patrick Chen <pat.chen@mail.utoronto.ca>
 
+Paul Hobson <pmhobson@gmail.com>
+Paul Hobson <pmhobson@gmail.com> vagrant <vagrant@precise32.(none)>
+
 Paul Ivanov <pivanov314@gmail.com> <pi@berkeley.edu>
 
 Per Parker <wisalam@live.com>
@@ -111,10 +148,18 @@ Phil Elson <pelson.pub@gmail.com>
 Phil Elson <pelson.pub@gmail.com> <philipelson@hotmail.com>
 Phil Elson <pelson.pub@gmail.com> <philipelson@gmail.com>
 
+productivememberofsociety666 <productivememberofsociety666@sol.fr.am> none <none@example.net>
+
+rasbt <mail@sebastianraschka.com> <se.raschka@me.com>
+
+RyanPan <ryanbelt1993129@hotmail.com>
+
 Scott Lasley <selasley@me.com>
 
 Simon Cross <hodgestar+github@gmail.com> <hodgestar@gmail.com>
 
+Slav <slavbacharov@gmail.com>
+
 sohero <herosgq@gmail.com> sohero <ivip@tom.com>
 
 Stefan van der Walt <stefanv@berkeley.edu> <stefan@sun.ac.za>

-Original file line number
+Diff line change
@@ @@ -1,4 +1,7 @@ @@
 +Adam Ortiz <[email protected]>
++
 Adrien F. Vincent <[email protected]>
 +Adrien F. Vincent <[email protected]> <[email protected]>
 Andrew Dawson <[email protected]> <[email protected]>
 Ben Root <[email protected]> Benjamin Root <[email protected]>
 +Benjamin Congdon <[email protected]>
 +Benjamin Congdon <[email protected]> bcongdon <[email protected]>
++
 Casper van der Wel <[email protected]>
 Christoph Gohlke <[email protected]> cgohlke <[email protected]>
 Christoph Gohlke <[email protected]> C. Gohlke <[email protected]>
 Cimarron Mittelsteadt <[email protected]> Cimarron <[email protected]>
 +DanHickstein <[email protected]>
++
 Daniel Hyams <[email protected]>
 Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
 David Kua <[email protected]> <[email protected]>
 +Devashish Deshpande <[email protected]>
++
 endolith <[email protected]>
 Eric Dill <[email protected]> <[email protected]>
 Eric Ma <[email protected]> <[email protected]>
 Eric Ma <[email protected]> <[email protected]>
 +Filipe <[email protected]>
++
 +Florian LB <[email protected]>
++
 Francesco Montesano <[email protected]> montefra <[email protected]>
 +hannah <[email protected]>
++
 +Hans Moritz Günther <[email protected]>
++
 +J. Goutin <[email protected]> JGoutin <[email protected]>
++
 +Jack Kelly <[email protected]> Jack (aka Daniel) Kelly <[email protected]>
++
 Jaime Fernandez <[email protected]>
 Jake Vanderplas <[email protected]>
 kikocorreoso <[email protected]> <[email protected]>
 +Klara Gerlei <[email protected]>
 +Klara Gerlei <[email protected]> klaragerlei <[email protected]>
++
 +Kristen M. Thyng <[email protected]>
++
 Leeonadoh <[email protected]>
 Lennart Fricke <[email protected]> <[email protected]>
 Levi Kilcher <[email protected]>
 +Lion Krischer <[email protected]>
++
 Martin Fitzpatrick <[email protected]> <[email protected]>
 Matthew Emmett <[email protected]>
 Matthew Emmett <[email protected]> <[email protected]>
 Matthias Bussonnier <[email protected]>
 +matthias <[email protected]>
 +matthias <[email protected]> <[email protected]>
++
 Michael Droettboom <[email protected]> <[email protected]>
 Michael Droettboom <[email protected]> Michael Droettboom <mdboom@debian-vm>
 MinRK <[email protected]>
 MinRK <[email protected]> Min RK <[email protected]>
 +Moritz Beyreuther <[email protected]>
++
 Nelle Varoquaux <[email protected]>
 Nic Eggert <[email protected]> Nic Eggert <[email protected]>
 Patrick Chen <[email protected]>
 +Paul Hobson <[email protected]>
 +Paul Hobson <[email protected]> vagrant <vagrant@precise32.(none)>
++
 Paul Ivanov <[email protected]> <[email protected]>
 Per Parker <[email protected]>
 Phil Elson <[email protected]> <[email protected]>
 Phil Elson <[email protected]> <[email protected]>
 +productivememberofsociety666 <[email protected]> none <[email protected]>
++
 +rasbt <[email protected]> <[email protected]>
++
 +RyanPan <[email protected]>
++
 Scott Lasley <[email protected]>
 Simon Cross <[email protected]> <[email protected]>
 +Slav <[email protected]>
++
 sohero <[email protected]> sohero <[email protected]>
 Stefan van der Walt <[email protected]> <[email protected]>