diff --git a/.mailmap b/.mailmap index 076860f1ef7e79f4651aab2b294f4f9e80bf66d5..74d7126b494ca0ca18ba4af933b155c251a2a87e 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,10 @@ Brian Cheung <bcheung5@gmail.com> <cow@rusty.(none)> Brian Holt <bh00038@cvplws63.eps.surrey.ac.uk> <bdholt1@gmail.com> Christian Osendorfer <osendorf@gmail.com> Clay Woolam <clay@woolam.org> +Denis Engemann <d.engemann@fz-juelich.de> +Denis Engemann <d.engemann@fz-juelich.de> <denis.engemann@gmail.com> +Denis Engemann <d.engemann@fz-juelich.de> <dengemann@Deniss-MacBook-Pro.local> +Denis Engemann <d.engemann@fz-juelich.de> <dengemann <denis.engemann@gmail.com> Diego Molla <dmollaaliod@gmail.com> <diego@diego-desktop.(none)> DraXus <draxus@gmail.com> draxus <draxus@hammer.ugr> Edouard DUCHESNAY <ed203246@is206877.intra.cea.fr> <duchesnay@is143433.(none)> @@ -25,10 +29,14 @@ Edouard DUCHESNAY <ed203246@is206877.intra.cea.fr> <edouard.duchesnay@gmail.com> Edouard DUCHESNAY <ed203246@is206877.intra.cea.fr> <edouard@is2206219.(none)> Emmanuelle Gouillart <emmanuelle.gouillart@nsup.org> Emmanuelle Gouillart <emmanuelle.gouillart@nsup.org> <emma@aleph.(none)> -Fabian Pedregosa <fabian@fseoane.net> <fabian.pedregosa@inria.fr> +Fabian Pedregosa <fabian.pedregosa@inria.fr> +Fabian Pedregosa <fabian.pedregosa@inria.fr> <fabian@fseoane.net> +Fabian Pedregosa <fabian.pedregosa@inria.fr> <f@bianp.net> Federico Vaggi <vaggi.federico@gmail.com> -Gael Varoquaux <gael.varoquaux@normalesup.org> -Gael Varoquaux <gael.varoquaux@normalesup.org> <varoquau@normalesup.org> +Federico Vaggi <vaggi.federico@gmail.com> <vaggi.federico@GMAIL.COM> +Gael Varoquaux <gael.varoquaux@inria.fr> +Gael Varoquaux <gael.varoquaux@inria.fr> <gael.varoquaux@normalesup.org> +Gael Varoquaux <gael.varoquaux@inria.fr> <varoquau@normalesup.org> Gilles Louppe <g.louppe@gmail.com> <g.louppe@ulg.ac.be> Harikrishnan S <hihari777@gmail.com> Hrishikesh Huilgolkar <hrishikesh911@gmail.com> <hrishikesh@QE-IND-WKS007.(none)> @@ -37,6 +45,7 @@ Jake VanderPlas <vanderplas@astro.washington.edu> <jakevdp@yahoo.com> Jake VanderPlas <vanderplas@astro.washington.edu> <jakevdp@gmail.com> Jake VanderPlas <vanderplas@astro.washington.edu> <vanderplas@astro.washington.edu> James Bergstra <james.bergstra@gmail.com> +Jaques Grobler <jaques.grobler@inria.fr> <jaquesgrobler@gmail.com> Jan Schl�ter <scikit-learn@jan-schlueter.de> Jean Kossaifi <jean.kossaifi@gmail.com> Jean Kossaifi <jean.kossaifi@gmail.com> <jkossaifi@is208616.intra.cea.fr> @@ -52,6 +61,7 @@ Nelle Varoquaux <nelle.varoquaux@gmail.com> Nelle Varoquaux <nelle.varoquaux@gmail.com> <nelle@phgroup.com> <nelle@varoquaux@gmail.com> Nicolas Pinto <pinto@alum.mit.edu> <pinto@mit.edu> Noel Dawe <Noel.Dawe@cern.ch> <noel.dawe@gmail.com> +Noel Dawe <Noel.Dawe@cern.ch> <noel.dAwe@cern.ch> Olivier Grisel <olivier.grisel@ensta.org> <ogrisel@turingcarpet.(none)> Olivier Grisel <olivier.grisel@ensta.org> <olivier.grisel@ensta.org> Olivier Hervieu <olivier.hervieu@gmail.com> <olivier.hervieu@tinyclues.com> @@ -78,3 +88,6 @@ Wei Li <kuantkid@gmail.com> Wei Li <kuantkid@gmail.com> <kuantkid+github@gmail.com> X006 <x006@x006-icsl.(none)> <x006@x006laptop.(none)> Xinfan Meng <mxf3306@gmail.com> <mxf@chomsky.localdomain> +Yannick Schwartz <yannick.schwartz@inria.fr> <yannick.schwartz@cea.fr> +Yannick Schwartz <yannick.schwartz@inria.fr> <ys218403@is220245.(none)> +