MNT: updated per jakevdp's request

tacaswell · tacaswell · commit d2c31d6aa253 · 2015-07-05T13:37:30.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -10,7 +10,8 @@ Daniel Hyams <dhyams@gmail.com> dhyams <dhyams@gmail.com>
 Eric Dill <thedizzle@gmail.com> Eric Dill <edill@bnl.gov>
 Erik Bray <erik.m.bray@gmail.com> Erik M. Bray <embray@stsci.edu>
 Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
-Jake Vanderplas <vanderplas@astro.washington.edu> Jake Vanderplas <jakevdp@yahoo.com>
+Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <jakevdp@yahoo.com>
+Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <vanderplas@astro.washington.edu>
 James R. Evans <jrevans1@earthlink.net> James Evans <jrevans1@earthlink.net>
 Jeffrey Bingham <bingjeff@gmail.com> Jeff Bingham <bingjeff@gmail.com>
 Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>

-Original file line number
+Diff line change
 Eric Dill <[email protected]> Eric Dill <[email protected]>
 Erik Bray <[email protected]> Erik M. Bray <[email protected]>
 Francesco Montesano <[email protected]> montefra <[email protected]>
 -Jake Vanderplas <[email protected]> Jake Vanderplas <[email protected]>
 +Jake Vanderplas <[email protected]> Jake Vanderplas <[email protected]>
 +Jake Vanderplas <[email protected]> Jake Vanderplas <[email protected]>
 James R. Evans <[email protected]> James Evans <[email protected]>
 Jeffrey Bingham <[email protected]> Jeff Bingham <[email protected]>
 Jens Hedegaard Nielsen <[email protected]> Jens Hedegaard Nielsen <[email protected]>