Update .mailmap

effigies · effigies · commit 29d1502369d2 · 2017-03-07T08:49:41.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -28,10 +28,15 @@ 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>
 Ben Cipollini <ben.cipollini@gmail.com> Ben Cipollini <bcipolli@ucsd.edu>
+Chris Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
 Chris Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
 Chris Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@gmail.com>
 Chris Markiewicz <effigies@gmail.com> Chris Johnson <effigies@bu.edu>
 Jaakko Leppäkangas <jaeilepp@student.jyu.fi> jaeilepp <jaeilepp@student.jyu.fi>
 Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
 Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
 Marc-Alexandre Côté <marc.cote.19@gmail.com> Marc-Alexandre Cote <marc.cote.19@gmail.com>
+Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
+Jasper J.F. van den Bosch <japsai@gmail.com> Jasper <japsai@gmail.com>
+Gregory R. Lee <grlee77@gmail.com> Gregory R. Lee <gregory.lee@cchmc.org>
+Demian Wassermann <demian@bwh.harvard.edu> Demian Wassermann <demian.wassermann@inria.fr>

-Original file line number
+Diff line change
 Basile Pinsard <[email protected]> bpinsard <[email protected]>
 Nguyen, Ly <[email protected]> lxn2 <[email protected]>
 Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
 +Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 Chris Markiewicz <[email protected]> Christopher J. Markiewicz <[email protected]>
 Chris Markiewicz <[email protected]> Chris Johnson <[email protected]>
 Jaakko Leppäkangas <[email protected]> jaeilepp <[email protected]>
 Ariel Rokem <[email protected]> arokem <[email protected]>
 Oliver P. Hinds <[email protected]> ohinds <[email protected]>
 Marc-Alexandre Côté <[email protected]> Marc-Alexandre Cote <[email protected]>
 +Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 +Jasper J.F. van den Bosch <[email protected]> Jasper <[email protected]>
 +Gregory R. Lee <[email protected]> Gregory R. Lee <[email protected]>
 +Demian Wassermann <[email protected]> Demian Wassermann <[email protected]>