MAINT: update .mailmap

matthew-brett · matthew-brett · commit 2943d2eaba05 · 2014-11-16T00:35:57.000-08:00
diff --git a/.mailmap b/.mailmap
@@ -20,3 +20,10 @@ Jean-Baptiste Poline <jbpoline@gmail.com> jbpoline <jbpoline@gmail.com>
 Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca> Félix C. Morency <felix.c.morency@usherbrooke.ca>
 Félix C. Morency <felix.morency@gmail.com> Félix C. Morency <felix.c.morency@usherbrooke.ca>
 Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>
+Eric Larson <larson.eric.d@gmail.com> Eric89GXL <larson.eric.d@gmail.com>
+Alexandre Gramfort <alexandre.gramfort@inria.fr> Alexandre Gramfort <alexandre.gramfort@m4x.org>
+Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
+Kevin S. Hahn <kevinshahn@gmail.com> Kevin S. Hahn <kshahn@stanford.edu>
+Basile Pinsard <basile.pinsard@gmail.com> bpinsard <basile.pinsard@gmail.com>
+Basile Pinsard <basile.pinsard@gmail.com> bpinsard <bpinsard@imed.jussieu.fr>
+Nguyen, Ly <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>

-Original file line number
+Diff line change
 Félix C. Morency <[email protected]> Felix C. Morency <[email protected]> Félix C. Morency <[email protected]>
 Félix C. Morency <[email protected]> Félix C. Morency <[email protected]>
 Krish Subramaniam <[email protected]> Krish Subramaniam <[email protected]>
 +Eric Larson <[email protected]> Eric89GXL <[email protected]>
 +Alexandre Gramfort <[email protected]> Alexandre Gramfort <[email protected]>
 +Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
 +Kevin S. Hahn <[email protected]> Kevin S. Hahn <[email protected]>
 +Basile Pinsard <[email protected]> bpinsard <[email protected]>
 +Basile Pinsard <[email protected]> bpinsard <[email protected]>
 +Nguyen, Ly <[email protected]> lxn2 <[email protected]>