##// END OF EJS Templates
Merge pull request #6522 from fperez/mailmap-fix...
Matthias Bussonnier -
r17942:41be799d merge
parent child Browse files
Show More
@@ -1,130 +1,133 b''
1 1 Aaron Culich <aculich@gmail.com> Aaron Culich <aculich@eecs.berkeley.edu>
2 2 Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
3 3 Benjamin Ragan-Kelley <benjaminrk@gmail.com> <minrk@Mercury.local>
4 4 Benjamin Ragan-Kelley <benjaminrk@gmail.com> Min RK
5 5 Benjamin Ragan-Kelley <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
6 6 Barry Wark <barrywark@gmail.com> Barry Wark <barrywarkatgmaildotcom>
7 7 Ben Edwards <bedwards@cs.unm.edu> Ben Edwards <bedwards@sausage.(none)>
8 8 Bradley M. Froehle <brad.froehle@gmail.com> Bradley M. Froehle <bfroehle@math.berkeley.edu>
9 9 Bradley M. Froehle <brad.froehle@gmail.com> Bradley Froehle <brad.froehle@gmail.com>
10 10 Brandon Parsons <brandon@parsonstx.com> Brandon Parsons <brandon.parsons@hp.com>
11 11 Brian E. Granger <ellisonbg@gmail.com> Brian Granger
12 12 Brian E. Granger <ellisonbg@gmail.com> Brian Granger <>
13 13 Brian E. Granger <ellisonbg@gmail.com> bgranger <>
14 14 Brian E. Granger <ellisonbg@gmail.com> bgranger <bgranger@red>
15 15 Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
16 16 Cyrille Rossant <cyrille.rossant@gmail.com> rossant <rossant@github>
17 17 Damián Avila <damianavila82@yahoo.com.ar> damianavila <damianavila82@yahoo.com.ar>
18 18 Damián Avila <damianavila82@yahoo.com.ar> damianavila <damianavila@gmail.com>
19 19 Darren Dale <dsdale24@gmail.com> darren.dale <>
20 20 Darren Dale <dsdale24@gmail.com> Darren Dale <>
21 21 Dav Clark <davclark@berkeley.edu> Dav Clark <>
22 22 Dav Clark <davclark@berkeley.edu> Dav Clark <davclark@gmail.com>
23 23 David Hirschfeld <david.hirschfeld@gazprom-mt.com> dhirschfeld <david.hirschfeld@gazprom-mt.com>
24 24 David P. Sanders <dpsanders@gmail.com> David P. Sanders <dpsanders@ciencias.unam.mx>
25 25 David Warde-Farley <wardefar@iro.umontreal.ca> David Warde-Farley <>
26 26 Doug Blank <dblank@cs.brynmawr.edu> Doug Blank <doug.blank@gmail.com>
27 27 Eugene Van den Bulke <eugene.van-den-bulke@gmail.com> Eugene Van den Bulke <eugene.vandenbulke@gmail.com>
28 28 Evan Patterson <epatters@enthought.com> <epatters@EPattersons-MacBook-Pro.local>
29 29 Evan Patterson <epatters@enthought.com> <epatters@evan-laptop.localdomain>
30 30 Evan Patterson <epatters@enthought.com> <epatters@caltech.edu>
31 31 Evan Patterson <epatters@enthought.com> <ejpatters@gmail.com>
32 32 Evan Patterson <epatters@enthought.com> epatters <ejpatters@gmail.com>
33 33 Evan Patterson <epatters@enthought.com> epatters <epatters@enthought.com>
34 34 Ernie French <ernestfrench@gmail.com> Ernie French <ernie@gqpbj.com>
35 35 Ernie French <ernestfrench@gmail.com> ernie french <ernestfrench@gmail.com>
36 36 Ernie French <ernestfrench@gmail.com> ernop <ernestfrench@gmail.com>
37 37 Fernando Perez <Fernando.Perez@berkeley.edu> <fperez.net@gmail.com>
38 38 Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fernando.perez@berkeley.edu>
39 39 Fernando Perez <Fernando.Perez@berkeley.edu> fperez <>
40 40 Fernando Perez <Fernando.Perez@berkeley.edu> fptest <>
41 41 Fernando Perez <Fernando.Perez@berkeley.edu> fptest1 <>
42 42 Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fernando.perez@berkeley.edu>
43 43 Fernando Perez <fernando.perez@berkeley.edu> Fernando Perez <>
44 44 Fernando Perez <fernando.perez@berkeley.edu> Fernando Perez <fperez@maqroll>
45 45 Frank Murphy <fpmurphy@mtu.edu> Frank Murphy <fmurphy@arbor.net>
46 46 Gabriel Becker <gmbecker@ucdavis.edu> gmbecker <gmbecker@ucdavis.edu>
47 47 Gael Varoquaux <gael.varoquaux@normalesup.org> gael.varoquaux <>
48 48 Gael Varoquaux <gael.varoquaux@normalesup.org> gvaroquaux <gvaroquaux@gvaroquaux-desktop>
49 49 Gael Varoquaux <gael.varoquaux@normalesup.org> Gael Varoquaux <>
50 50 Ingolf Becker <ingolf.becker@googlemail.com> watercrossing <ingolf.becker@googlemail.com>
51 51 Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <vanderplas@astro.washington.edu>
52 52 Jakob Gager <jakob.gager@gmail.com> jakobgager <jakob.gager@gmail.com>
53 53 Jakob Gager <jakob.gager@gmail.com> jakobgager <gager@ilsb.tuwien.ac.at>
54 54 Jakob Gager <jakob.gager@gmail.com> jakobgager <jakobgager@hotmail.com>
55 Jason Grout <jason.grout@drake.edu> Jason Grout <jason-github@creativetrax.com>
55 Jason Grout <jgrout6@bloomberg.net> <jason.grout@drake.edu>
56 Jason Grout <jgrout6@bloomberg.net> <jason-github@creativetrax.com>
56 57 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jhn@jhn-Znote.(none)>
57 58 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
58 59 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
59 60 Jez Ng <jezreel@gmail.com> Jez Ng <me@jezng.com>
60 61 Jonathan Frederic <jdfreder@calpoly.edu> Jonathan Frederic <jonathan@LifebookMint.(none)>
61 62 Jonathan Frederic <jdfreder@calpoly.edu> Jonathan Frederic <jon.freder@gmail.com>
62 63 Jonathan Frederic <jdfreder@calpoly.edu> Jonathan Frederic <xh3xx.goose@gmail.com>
63 64 Jonathan Frederic <jdfreder@calpoly.edu> jon <jon.freder@gmail.com>
64 65 Jonathan March <jmarch@enthought.com> Jonathan March <JDM@MarchRay.net>
65 66 Jonathan March <jmarch@enthought.com> jdmarch <JDM@marchRay.net>
66 67 Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jörgen Stenarson <jorgen.stenarson@bostream.nu>
67 68 Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jorgen Stenarson <jorgen.stenarson@bostream.nu>
68 69 Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jorgen Stenarson <>
69 70 Jörgen Stenarson <jorgen.stenarson@kroywen.se> jstenar <jorgen.stenarson@bostream.nu>
70 71 Jörgen Stenarson <jorgen.stenarson@kroywen.se> jstenar <>
71 72 Jörgen Stenarson <jorgen.stenarson@kroywen.se> Jörgen Stenarson <jorgen.stenarson@kroywen.se>
72 73 Juergen Hasch <python@elbonia.de> juhasch <python@elbonia.de>
73 74 Kyle Kelley <rgbkrk@gmail.com> Kyle Kelley <kyle.kelley@rackspace.com>
74 75 Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent.dufrechou@gmail.com>
75 76 Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent@Pep>
76 77 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent dufrechou <>
77 78 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou <>
78 79 Laurent Dufréchou <laurent.dufrechou@gmail.com> Laurent Dufrechou <>
79 80 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou@gmail.com <>
80 81 Laurent Dufréchou <laurent.dufrechou@gmail.com> ldufrechou <ldufrechou@PEP>
81 82 Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
82 83 Marc Molla <marcmolla@gmail.com> marcmolla <marcmolla@gmail.com>
83 84 Martín Gaitán <gaitan@gmail.com> Martín Gaitán <gaitan@phasety.com>
84 85 Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
85 86 Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
86 87 Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@umr168-curn-1-24x-6561.curie.fr>
87 88 Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias Bussonnier <carreau@Aspire.(none)>
88 89 Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>
89 90 Nicolas Rougier <Nicolas.Rougier@inria.fr> <Nicolas.rougier@inria.fr>
90 91 Omar Andrés Zapata Mesa <andresete.chaos@gmail.com> Omar Andres Zapata Mesa <andresete.chaos@gmail.com>
91 92 Omar Andrés Zapata Mesa <andresete.chaos@gmail.com> Omar Andres Zapata Mesa <omazapa@tuxhome>
92 93 Pankaj Pandey <pankaj86@gmail.com> Pankaj Pandey <pankaj@enthought.com>
93 94 Pascal Schetelat <pascal.schetelat@gmail.com> pascal-schetelat <pascal.schetelat@gmail.com>
94 95 Paul Ivanov <pi@berkeley.edu> Paul Ivanov <pivanov314@gmail.com>
95 96 Pauli Virtanen <pauli.virtanen@iki.fi> Pauli Virtanen <>
96 97 Pauli Virtanen <pauli.virtanen@iki.fi> Pauli Virtanen <pav@iki.fi>
97 98 Pietro Berkes <pberkes@enthought.com> Pietro Berkes <pietro.berkes@googlemail.com>
98 99 Piti Ongmongkolkul <piti118@gmail.com> piti118 <piti118@gmail.com>
99 100 Prabhu Ramachandran <prabhu@enthought.com> Prabhu Ramachandran <>
100 101 Puneeth Chaganti <punchagan@gmail.com> Puneeth Chaganti <punchagan@muse-amuse.in>
101 102 Robert Kern <robert.kern@gmail.com> rkern <>
102 103 Robert Kern <robert.kern@gmail.com> Robert Kern <rkern@enthought.com>
103 104 Robert Kern <robert.kern@gmail.com> Robert Kern <rkern@Sacrilege.local>
104 105 Robert Kern <robert.kern@gmail.com> Robert Kern <>
105 106 Robert Marchman <bo.marchman@gmail.com> Robert Marchman <robert.l.marchman@dartmouth.edu>
106 107 Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satra@ba5.mit.edu>
107 108 Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
108 109 smithj1 <smithj1@LMC-022896.local> smithj1 <smithj1@LMC-022896.swisscom.com>
109 110 smithj1 <smithj1@LMC-022896.local> smithj1 <smithj1@lmc-022896.local>
110 111 Steven Johnson <steven.johnson@drake.edu> stevenJohnson <steven.johnson@drake.edu>
111 112 Steven Silvester <steven.silvester@ieee.org> blink1073 <steven.silvester@ieee.org>
112 113 S. Weber <s8weber@c4.usr.sh> s8weber <s8weber@c5.usr.sh>
113 114 Stefan van der Walt <stefan@sun.ac.za> Stefan van der Walt <bzr@mentat.za.net>
115 Sylvain Corlay <scorlay@bloomberg.net> <sylvain.corlay@gmail.com>
116 Sylvain Corlay <scorlay@bloomberg.net> sylvain.corlay <sylvain.corlay@gmail.com>
114 117 Ted Drain <ted.drain@gmail.com> TD22057 <ted.drain@gmail.com>
115 118 Théophile Studer <theo.studer@gmail.com> Théophile Studer <studer@users.noreply.github.com>
116 119 Thomas Kluyver <takowl@gmail.com> Thomas <takowl@gmail.com>
117 120 Thomas Spura <tomspur@fedoraproject.org> Thomas Spura <thomas.spura@gmail.com>
118 121 Timo Paulssen <timonator@perpetuum-immobile.de> timo <timonator@perpetuum-immobile.de>
119 122 vds <vds@VIVIAN> vds2212 <vds2212@VIVIAN>
120 123 vds <vds@VIVIAN> vds <vds@vivian>
121 124 Ville M. Vainio <vivainio@gmail.com> <vivainio2@WN-W0941>
122 125 Ville M. Vainio <vivainio@gmail.com> ville <ville@VILLE-PC>
123 126 Ville M. Vainio <vivainio@gmail.com> ville <ville@ville-desktop>
124 127 Ville M. Vainio <vivainio@gmail.com> vivainio <>
125 128 Ville M. Vainio <vivainio@gmail.com> Ville M. Vainio <vivainio@villev>
126 129 Ville M. Vainio <vivainio@gmail.com> Ville M. Vainio <vivainio@ville_vmw>
127 130 Walter Doerwald <walter@livinglogic.de> walter.doerwald <>
128 131 Walter Doerwald <walter@livinglogic.de> Walter Doerwald <>
129 132 W. Trevor King <wking@tremily.us> W. Trevor King <wking@drexel.edu>
130 Yoval P. <yoval@gmx.com> y-p <yoval@gmx.com> No newline at end of file
133 Yoval P. <yoval@gmx.com> y-p <yoval@gmx.com>
General Comments 0
You need to be logged in to leave comments. Login now