MAINT: Update .mailmap

effigies · effigies · commit 59a7c3df0e1b · 2019-01-26T23:08:03.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -3,6 +3,7 @@ Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
 Alejandro Tabas <alextabas@gmail.com> qTabs <qtabas@gmail.com>
 Alejandro Tabas <alextabas@gmail.com> qtabs <alextabas@gmail.com>
 Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
+Alejandro de la Vega <aleph4@gmail.com> delavega4 <aleph4@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
 Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
@@ -62,6 +63,7 @@ Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> erik <erik@erik-ubuntu.(none)>
 Erik Ziegler <erik.sweed@gmail.com> erikz <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> swederik <erik.sweed@gmail.com>
+Feilong Ma <mafeilong@gmail.com> Ma Feilong <mafeilong@gmail.com>
 Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
 Franz Liem <franz.liem@gmail.com> fliem <franz.liem>
 Franz Liem <franz.liem@gmail.com> fliem <franz.liem@gmail.com>

-Original file line number
+Diff line change
 Alejandro Tabas <[email protected]> qTabs <[email protected]>
 Alejandro Tabas <[email protected]> qtabs <[email protected]>
 Alejandro de la Vega <[email protected]> adelavega <[email protected]>
 +Alejandro de la Vega <[email protected]> delavega4 <[email protected]>
 Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
 Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
 Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
 Erik Ziegler <[email protected]> erik <erik@erik-ubuntu.(none)>
 Erik Ziegler <[email protected]> erikz <[email protected]>
 Erik Ziegler <[email protected]> swederik <[email protected]>
 +Feilong Ma <[email protected]> Ma Feilong <[email protected]>
 Fernando Pérez-García <[email protected]> Fernando <[email protected]>
 Franz Liem <[email protected]> fliem <franz.liem>
 Franz Liem <[email protected]> fliem <[email protected]>