MAINT: Updated mailmap

madphysicist · madphysicist · commit eeb76585b932 · 2016-04-11T16:28:40.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -28,6 +28,7 @@ John Hunter <jdh2358@gmail.com>
 Jorrit Wronski <jowr@mek.dtu.dk>
 Jouni K. Seppänen <jks@iki.fi>
 Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Mad Physicist <madphysicist@users.noreply.github.com>
+Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <joseph.r.fox-rabinovitz@nasa.gov>
 Julien Schueller <julien.schueller@gmail.com> <schueller@porsche-l64.phimeca.lan>
 Julien Schueller <julien.schueller@gmail.com> <schueller@bx-l64.phimeca.lan>
 Kevin Davies <kdavies4@gmail.com> <daviesk24@yahoo.com>

-Original file line number
+Diff line change
 Jorrit Wronski <[email protected]>
 Jouni K. Seppänen <[email protected]>
 Joseph Fox-Rabinovitz <[email protected]> Mad Physicist <[email protected]>
 +Joseph Fox-Rabinovitz <[email protected]> Joseph Fox-Rabinovitz <[email protected]>
 Julien Schueller <[email protected]> <[email protected]>
 Julien Schueller <[email protected]> <[email protected]>
 Kevin Davies <[email protected]> <[email protected]>