Skip to content

Commit

Permalink
Merge pull request numpy#8251 from madphysicist/mailmap-cleanup
Browse files Browse the repository at this point in the history
MAINT: Cleaned up mailmap
  • Loading branch information
charris authored Nov 7, 2016
2 parents e287741 + 846781e commit 3fd2fa1
Showing 1 changed file with 22 additions and 36 deletions.
58 changes: 22 additions & 36 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@

Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost>
Abdul Muneer <[email protected]> abdulmuneer <[email protected]>
Adam Ginsburg <[email protected]> Adam Ginsburg <[email protected]>
Adam Ginsburg <[email protected]> Adam Ginsburg <[email protected]>
Allan Haldane <[email protected]> ahaldane <[email protected]>
Albert Jornet Puig <[email protected]> jurnix <[email protected]>
Alexander Belopolsky <[email protected]> Alexander Belopolsky <[email protected]>
Alex Griffing <[email protected]> alex <[email protected]>
Alex Griffing <[email protected]> argriffing <[email protected]>
Alex Griffing <[email protected]> argriffing <[email protected]>
Alex Griffing <[email protected]> argriffing <[email protected]>
Alexander Belopolsky <[email protected]> Alexander Belopolsky <[email protected]>
Alok Singhal <[email protected]> Alok Singhal <[email protected]>
Allan Haldane <[email protected]> ahaldane <[email protected]>
Alok Singhal <[email protected]> Alok Singhal <[email protected]>
Amir Sarabadani <[email protected]> amir <[email protected]>
Anatoly Techtonik <[email protected]> anatoly techtonik <[email protected]>
Expand All @@ -28,8 +26,8 @@ Anne Archibald <[email protected]> aarchiba <[email protected]>
Anne Archibald <[email protected]> Anne Archibald <[email protected]>
Anže Starič <[email protected]> astaric <[email protected]>
Aron Ahmadia <[email protected]> ahmadia <[email protected]>
Arun Persaud <[email protected]> Arun Persaud <[email protected]>
Arun Persaud <[email protected]> Arun Persaud <[email protected]>
Åsmund Hjulstad <[email protected]> Åsmund Hjulstad <[email protected]>
Auke Wiggers <[email protected]> auke <[email protected]>
Badhri Narayanan Krishnakumar <[email protected]> badhrink <[email protected]>
Behzad Nouri <[email protected]> behzad nouri <[email protected]>
Expand All @@ -42,19 +40,17 @@ Bryan Van de Ven <[email protected]> Bryan Van de Ven <[email protected]>
Bryan Van de Ven <[email protected]> Bryan Van de Ven <[email protected]>
Carl Kleffner <[email protected]> carlkl <[email protected]>
Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost>
Chris Kerr <[email protected]> Chris Kerr <[email protected]>
Chris Kerr <[email protected]> Chris Kerr <[email protected]>
Christoph Gohlke <[email protected]> Christolph Gohlke <[email protected]>
Christopher Hanley <[email protected]> chanley <[email protected]>
Christoph Gohlke <[email protected]> cgholke <?@?>
Christoph Gohlke <[email protected]> cgohlke <[email protected]>
Christopher Hanley <[email protected]> chanley <[email protected]>
Daniel <[email protected]> Daniel <[email protected]>
Christoph Gohlke <[email protected]> Christolph Gohlke <[email protected]>
Daniel da Silva <[email protected]> Daniel da Silva <[email protected]>
Daniel da Silva <[email protected]> Daniel da Silva <[email protected]>
Daniel J Farrell <[email protected]> danieljfarrell <[email protected]>
Daniel Rasmussen <[email protected]> drasmuss <[email protected]>
Daniel Müllner <Daniel Müllner [email protected]> Daniel <[email protected]>
Daniel Müllner <Daniel Müllner [email protected]> dmuellner <Daniel Müllner [email protected]>
Daniel da Silva <[email protected]> Daniel da Silva <[email protected]>
Daniel da Silva <[email protected]> Daniel da Silva <[email protected]>
Daniel Rasmussen <[email protected]> drasmuss <[email protected]>
David Huard <[email protected]> dhuard <dhuard@localhost>
David M Cooke <cookedm@localhost> cookedm <cookedm@localhost>
David Ochoa <[email protected]> ochoadavid <[email protected]>
Expand All @@ -63,52 +59,46 @@ Derek Homeier <[email protected]> Derek Homeir <[email protected]
Derek Homeier <[email protected]> Derek Homier <[email protected]>
Egor Zindy <[email protected]> zindy <[email protected]>
Endolith <[email protected]>
Eric Fode <[email protected]> Eric Fode <[email protected]>
Eric Fode <[email protected]> Eric Fode <ericfode@linuxlaptop.(none)>
Eric Quintero <[email protected]> e-q <[email protected]>
Ernest N. Mamikonyan <[email protected]> mamikony <[email protected]>
Evgeni Burovski <[email protected]> Evgeni Burovski <[email protected]>
Evgeni Burovski <[email protected]> Evgeni Burovski <[email protected]>
Evgeny Toder <[email protected]> eltjpm <[email protected]>
Fernando Perez <[email protected]> Fernando Perez <[email protected]>
Friedrich Dunne <[email protected]> dunneff <[email protected]>
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
Gerrit Holl <[email protected]> Gerrit Holl <[email protected]>
Gerrit Holl <[email protected]> Gerrit Holl <[email protected]>
Giuseppe Venturini <[email protected]> ggventurini <[email protected]>
Golnaz Irannejad <[email protected]> golnazir <[email protected]>
Gopal Singh Meena <[email protected]> gopalmeena <[email protected]>
Greg Knoll <[email protected]> gkBCCN <[email protected]>
Greg Yang <[email protected]> eulerreich <[email protected]>
Greg Young <[email protected]> gfyoung <[email protected]>
Greg Young <[email protected]> gfyoung <[email protected]>
Greg Yang <[email protected]> eulerreich <[email protected]>
Jason Grout <[email protected]> Jason Grout <[email protected]>
Jason Grout <[email protected]> Jason Grout <[email protected]>
Jason King <[email protected]> jason king <[email protected]>
Joseph Martinot-Lagarde <[email protected]> Joseph Martinot-Lagarde <[email protected]>
Joseph Martinot-Lagarde <[email protected]> Joseph Martinot-Lagarde <[email protected]>
Julien Lhermitte <[email protected]> Julien Lhermitte <[email protected]>
Julien Lhermitte <[email protected]> Julien Lhermitte <[email protected]>
Julien Schueller <[email protected]> jschueller <[email protected]>
Han Genuit <[email protected]> 87 <[email protected]>
Han Genuit <[email protected]> Han <[email protected]>
Han Genuit <[email protected]> [email protected] <[email protected]>
Han Genuit <[email protected]> Han <[email protected]>
Hanno Klemm <[email protected]> hklemm <[email protected]>
Irvin Probst <[email protected]> I--P <[email protected]>
Jaime Fernandez <[email protected]> Jaime <[email protected]>
Jaime Fernandez <[email protected]> Jaime Fernandez <[email protected]>
Jaime Fernandez <[email protected]> jaimefrio <[email protected]>
Jaime Fernandez <[email protected]> Jaime <[email protected]>
Jarrod Millman <[email protected]> Jarrod Millman <[email protected]>
Jason Grout <[email protected]> Jason Grout <[email protected]>
Jason King <[email protected]> jason king <[email protected]>
Jay Bourque <[email protected]> jayvius <[email protected]>
Jerome Kelleher <[email protected]> jeromekelleher <[email protected]>
Johannes Schönberger <[email protected]> Johannes Schönberger <[email protected]>
Joseph Fox-Rabinovitz <[email protected]> Joseph Fox-Rabinovitz <[email protected]>
Joseph Fox-Rabinovitz <[email protected]> Mad Physicist <[email protected]>
Joseph Martinot-Lagarde <[email protected]> Joseph Martinot-Lagarde <[email protected]>
Julian Taylor <[email protected]> Julian Taylor <[email protected]>
Julian Taylor <[email protected]> Julian Taylor <[email protected]>
Julien Lhermitte <[email protected]> Julien Lhermitte <[email protected]>
Julien Schueller <[email protected]> jschueller <[email protected]>
Khaled Ben Abdallah Okuda <[email protected]> KhaledTo <[email protected]>
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
Luis Pedro Coelho <[email protected]> Luis Pedro Coelho <[email protected]>
Luke Zoltan Kelley <[email protected]> lzkelley <[email protected]>
Manoj Kumar <[email protected]> MechCoder <[email protected]>
Expand All @@ -122,47 +112,45 @@ Martin Teichmann <[email protected]> Martin Teichmann <lkb.teichmann@gmai
Mattheus Ueckermann <[email protected]> empeeu <[email protected]>
Matthew Harrigan <[email protected]> MattHarrigan <[email protected]>
Matti Picus <[email protected]> mattip <[email protected]>
Michael Behrisch <[email protected]> behrisch <[email protected]>
Michael Droettboom <[email protected]> mdroe <mdroe@localhost>
Michael Martin <[email protected]> mmartin <[email protected]>
Michael K. Tran <[email protected]> mtran <[email protected]>
Michael Behrisch <[email protected]> behrisch <[email protected]>
Michael Martin <[email protected]> mmartin <[email protected]>
Nathaniel J. Smith <[email protected]> njsmith <[email protected]>
Naveen Arunachalam <[email protected]> naveenarun <[email protected]>
Nicolas Scheffer <[email protected]> Nicolas Scheffer <[email protected]>
Ondřej Čertík <[email protected]> Ondrej Certik <[email protected]>
Óscar Villellas Guillén <[email protected]> ovillellas <[email protected]>
Pat Miller <patmiller@localhost> patmiller <patmiller@localhost>
Paul Ivanov <[email protected]> Paul Ivanov <paul.ivanov@local>
Paul Jacobson <[email protected]> hpaulj <[email protected]>
Pearu Peterson <[email protected]> Pearu Peterson <pearu@pearu-laptop.(none)>
Peter J Cock <[email protected]> peterjc <[email protected]>
Phil Elson <[email protected]>
Pierre GM <[email protected]> pierregm <pierregm@localhost>
Pierre GM <[email protected]> pierregm <[email protected]>
Pierre GM <[email protected]> pierregm <pierregm@localhost>
Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
Ralf Gommers <[email protected]> Ralf Gommers <[email protected]>
Ralf Gommers <[email protected]> rgommers <[email protected]>
Rehas Sachdeva <[email protected]> rehassachdeva <[email protected]>
Ritta Narita <[email protected]> RittaNarita <[email protected]>
Robert Kern <[email protected]> Robert Kern <[email protected]>
Robert LU <[email protected]> RobberPhex <[email protected]>
Ronan Lamy <[email protected]> Ronan Lamy <[email protected]>
Ronan Lamy <[email protected]> Ronan Lamy <[email protected]>
Russell Hewett <[email protected]> rhewett <[email protected]>
Ryan Blakemore <[email protected]> ryanblak <[email protected]>
Sam Preston <[email protected]> jspreston <[email protected]>
Sam Radhakrishnan <[email protected]> = <=>
Sam Radhakrishnan <[email protected]> sam09 <[email protected]>
Saurabh Mehta <[email protected]>
Saullo Giovani <[email protected]> saullogiovani <[email protected]>
Saurabh Mehta <[email protected]>
Sebastian Berg <[email protected]> seberg <[email protected]>
Shota Kawabuchi <[email protected]> skwbc <[email protected]>
Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]>
Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]>
Stephan Hoyer <[email protected]> Stephan Hoyer <[email protected]>
Stephan Hoyer <[email protected]> Stephan Hoyer <[email protected]>
Steven J Kern <[email protected]>
Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
Tim Cera <[email protected]> tim cera <[email protected]>
Tom Poole <[email protected]> tpoole <[email protected]>
Travis Oliphant <[email protected]> Travis E. Oliphant <[email protected]>
Expand All @@ -171,5 +159,3 @@ Valentin Haenel <[email protected]> Valentin Haenel <[email protected]>
Warren Weckesser <[email protected]> Warren Weckesser <[email protected]>
Wendell Smith <[email protected]> Wendell Smith <[email protected]>
William Spotz <[email protected]@localhost> [email protected] <[email protected]@localhost>
Åsmund Hjulstad <[email protected]> Åsmund Hjulstad <[email protected]>
Óscar Villellas Guillén <[email protected]> ovillellas <[email protected]>

0 comments on commit 3fd2fa1

Please sign in to comment.