MAINT: Yet more .mailmap updates for recent contributors.

charris · charris · commit 10e461be85d3 · 2016-03-28T09:11:24.000-06:00
diff --git a/.mailmap b/.mailmap
@@ -23,12 +23,14 @@ Alok Singhal <gandalf013@gmail.com> Alok Singhal <gandalf013@gmail.com>
 Alok Singhal <gandalf013@gmail.com> Alok Singhal <alok@merfinllc.com>
 Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.com>
 Anatoly Techtonik <techtonik@gmail.com> anatoly techtonik <techtonik@gmail.com>
+Andrei Kucharavy <ank@andreikucharavy.com> chiffa <ank@andreikucharavy.com>
 Anne Archibald <peridot.faceted@gmail.com> aarchiba <peridot.faceted@gmail.com>
 Anne Archibald <peridot.faceted@gmail.com> Anne Archibald <archibald@astron.nl>
 Anže Starič <anze.staric@gmail.com> astaric <anze.staric@gmail.com>
 Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
 Arun Persaud <apersaud@lbl.gov> Arun Persaud <apersaud@lbl.gov>
 Arun Persaud <apersaud@lbl.gov> Arun Persaud <arun@nubati.net>
+Auke Wiggers <wiggers.auke@gmail.com> auke <wiggers.auke@gmail.com>
 Behzad Nouri <behzadnouri@gmail.com> behzad nouri <behzadnouri@gmail.com>
 Benjamin Root <ben.v.root@gmail.com> Ben Root <ben.v.root@gmail.com>
 Benjamin Root <ben.v.root@gmail.com> weathergod <?@?>
@@ -69,7 +71,9 @@ Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@nor
 Gerrit Holl <g.holl@reading.ac.uk> Gerrit Holl <g.holl@reading.ac.uk>
 Gerrit Holl <gerrit.holl@utoronto.ca> Gerrit Holl <g.holl@reading.ac.uk>
 Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com>
+Golnaz Irannejad <golnazirannejad@gmail.com> golnazir <golnazirannejad@gmail.com>
 Gopal Singh Meena <gopalmeena94@gmail.com> gopalmeena <gopalmeena94@gmail.com>
+Greg Knoll <gregory@bccn-berlin.de> gkBCCN <gregory@bccn-berlin.de>
 Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung17@gmail.com>
 Greg Young <gfyoung17@gmail.com> gfyoung <gfyoung@mit.edu>
 Greg Yang <sorcererofdm@gmail.com> eulerreich <sorcererofdm@gmail.com>
@@ -85,6 +89,7 @@ Han Genuit <hangenuit@gmail.com> 87 <hangenuit@gmail.com>
 Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
 Han Genuit <hangenuit@gmail.com> hangenuit@gmail.com <hangenuit@gmail.com>
 Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
+Irvin Probst <irvin.probst@ensta-bretagne.fr> I--P <irvin.probst@ensta-bretagne.fr>
 Jaime Fernandez <jaime.frio@gmail.com> Jaime <jaime.frio@gmail.com>
 Jaime Fernandez <jaime.frio@gmail.com> Jaime Fernandez <jaime.fernandez@hp.com>
 Jaime Fernandez <jaime.frio@gmail.com> jaimefrio <jaime.frio@gmail.com>
@@ -109,6 +114,7 @@ Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
 Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
 Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
 Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
+Michael Martin <mmartin4242@gmail.com> mmartin <mmartin4242@gmail.com>
 Michael  K. Tran  <trankmichael@gmail.com> mtran <trankmichael@gmail.com>
 Michael Behrisch <oss@behrisch.de> behrisch <behrisch@users.sourceforge.net>
 Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>

-Original file line number
+Diff line change
 Alok Singhal <[email protected]> Alok Singhal <[email protected]>
 Amir Sarabadani <[email protected]> amir <[email protected]>
 Anatoly Techtonik <[email protected]> anatoly techtonik <[email protected]>
 +Andrei Kucharavy <[email protected]> chiffa <[email protected]>
 Anne Archibald <[email protected]> aarchiba <[email protected]>
 Anne Archibald <[email protected]> Anne Archibald <[email protected]>
 Anže Starič <[email protected]> astaric <[email protected]>
 Aron Ahmadia <[email protected]> ahmadia <[email protected]>
 Arun Persaud <[email protected]> Arun Persaud <[email protected]>
 Arun Persaud <[email protected]> Arun Persaud <[email protected]>
 +Auke Wiggers <[email protected]> auke <[email protected]>
 Behzad Nouri <[email protected]> behzad nouri <[email protected]>
 Benjamin Root <[email protected]> Ben Root <[email protected]>
 Benjamin Root <[email protected]> weathergod <?@?>
 Gerrit Holl <[email protected]> Gerrit Holl <[email protected]>
 Gerrit Holl <[email protected]> Gerrit Holl <[email protected]>
 Giuseppe Venturini <[email protected]> ggventurini <[email protected]>
 +Golnaz Irannejad <[email protected]> golnazir <[email protected]>
 Gopal Singh Meena <[email protected]> gopalmeena <[email protected]>
 +Greg Knoll <[email protected]> gkBCCN <[email protected]>
 Greg Young <[email protected]> gfyoung <[email protected]>
 Greg Young <[email protected]> gfyoung <[email protected]>
 Greg Yang <[email protected]> eulerreich <[email protected]>
 Han Genuit <[email protected]> Han <[email protected]>
 Han Genuit <[email protected]> [email protected] <[email protected]>
 Hanno Klemm <[email protected]> hklemm <[email protected]>
 +Irvin Probst <[email protected]> I--P <[email protected]>
 Jaime Fernandez <[email protected]> Jaime <[email protected]>
 Jaime Fernandez <[email protected]> Jaime Fernandez <[email protected]>
 Jaime Fernandez <[email protected]> jaimefrio <[email protected]>
 Martin Teichmann <[email protected]> Martin Teichmann <[email protected]>
 Mattheus Ueckermann <[email protected]> empeeu <[email protected]>
 Michael Droettboom <[email protected]> mdroe <mdroe@localhost>
 +Michael Martin <[email protected]> mmartin <[email protected]>
 Michael  K. Tran  <[email protected]> mtran <[email protected]>
 Michael Behrisch <[email protected]> behrisch <[email protected]>
 Nathaniel J. Smith <[email protected]> njsmith <[email protected]>