summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap10
-rw-r--r--AUTHORS4
2 files changed, 10 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index 39a9f2be76..936f6ccb02 100644
--- a/.mailmap
+++ b/.mailmap
@@ -590,6 +590,7 @@ Earl Hood <unknown> Earl Hood <unknown>
Ed Avis <eda@waniasset.com> Ed Avis <eda@waniasset.com>
Ed J <etj@cpan.org> Ed J <etj@cpan.org>
Ed J <etj@cpan.org> Ed J <mohawk2@users.noreply.github.com>
+Ed Sabol <esabol@users.noreply.github.com> Ed Sabol <esabol@users.noreply.github.com>
Ed Santiago <esm@pobox.com> Ed Santiago <esm@pobox.com>
Edgar Bering <trizor@gmail.com> Edgar Bering <trizor@gmail.com>
Edmund Bacon <unknown> Edmund Bacon <unknown>
@@ -601,6 +602,7 @@ Edward Peschko <edwardp@excitehome.net> Edward Peschko <edwardp@excitehome.net>
Edward Peschko <edwardp@excitehome.net> Edward S. Peschko <esp5@pge.com>
Elaine -HFB- Ashton <elaine@chaos.wustl.edu> Elaine -HFB- Ashton <elaine@chaos.wustl.edu>
Elizabeth Mattijsen <liz@dijkmat.nl> Elizabeth Mattijsen <liz@dijkmat.nl>
+Elvin Aslanov <rwp.primary@gmail.com> Elvin Aslanov <rwp.primary@gmail.com>
Enrico Sorcinelli <bepi@perl.it> Enrico Sorcinelli <bepi@perl.it>
Enrico Sorcinelli <bepi@perl.it> Enrico Sorcinelli <enrico.sorcinelli@gmail.com>
Eric Amick <unknown> Amick, Eric <perlbug@perl.org>
@@ -1160,8 +1162,9 @@ Mark Dickinson <dickins3@fas.harvard.edu> Mark Dickinson <dickins3@fas.harvard.e
Mark Dootson <mdootson@cpan.org> Mark Dootson <mdootson@cpan.org>
Mark Fowler <mark@twoshortplanks.com> Mark Fowler <mark@twoshortplanks.com>
Mark J. Reed <mreed@strange.turner.com> Mark J. Reed <mreed@strange.turner.com>
-Mark Jason Dominus <mjd@plover.com> Mark Jason Dominus <mjd@plover.com>
-Mark Jason Dominus <mjd@plover.com> Mark-Jason Dominus <mjd@plover.com>
+Mark Jason Dominus <mjd@pobox.com> Mark Dominus <mjd@pobox.com>
+Mark Jason Dominus <mjd@pobox.com> Mark Jason Dominus <mjd@plover.com>
+Mark Jason Dominus <mjd@pobox.com> Mark-Jason Dominus <mjd@plover.com>
Mark Kettenis <kettenis@wins.uva.nl> Mark Kettenis <kettenis@wins.uva.nl>
Mark Kvale <kvale@phy.ucsf.edu> Mark Kvale <kvale@phy.ucsf.edu>
Mark Leighton Fisher <markleightonfisher@gmail.com> <markleightonfisher@gmail.com>
@@ -1290,6 +1293,7 @@ Milosz Tanski <mtanski@gridapp.com> Milosz Tanski <mtanski@gridapp.com>
Milton L. Hankins <mlh@swl.msd.ray.com> Milton Hankins {64892} <webtools@uewrhp03.msd.ray.com>
Milton L. Hankins <mlh@swl.msd.ray.com> Milton L. Hankins <mlh@swl.msd.ray.com>
Misty De Meo <mistydemeo@github.com> Misty De Meo <mistydemeo@github.com>
+Mohammad S Anwar <mohammad.anwar@yahoo.com> Mohammad S Anwar <mohammad.anwar@yahoo.com>
Mohammed El-Afifi <mohammed_elafifi@yahoo.com> Mohammed El-Afifi <mohammed_elafifi@yahoo.com>
Moritz Lenz <moritz@casella.verplant.org> Moritz Lenz <moritz lenz>
Moritz Lenz <moritz@casella.verplant.org> Moritz Lenz <moritz@casella.verplant.org>
@@ -1331,6 +1335,7 @@ Nick Ing-Simmons <unknown> Nick Ing-Simmons <nik@tiuk.ti.com>
Nick Johnston <nickjohnstonsky@gmail.com> Nick Johnston <nickjohnstonsky@gmail.com>
Nick Williams <nick.williams@morganstanley.com> Nick Williams <nick.williams@morganstanley.com>
Nicolas Kaiser <nikai@nikai.net> Nicolas Kaiser <nikai@nikai.net>
+Nicolas Mendoza <mendoza@pvv.ntnu.no> Nicolas Mendoza <mendoza@pvv.ntnu.no>
Nicolas R <atoomic@cpan.org> Nicolas R <atoomic@cpan.org>
Nicolas R <atoomic@cpan.org> Nicolas R <cpan@atoomic.org>
Nicolas R <atoomic@cpan.org> Nicolas R <nicolas@atoomic.org>
@@ -1660,6 +1665,7 @@ Shlomi Fish <shlomif@cpan.org> Shlomi Fish <shlomif@iglu.org.il>
Shlomi Fish <shlomif@cpan.org> Shlomi Fish <shlomif@shlomifish.org>
Shlomi Fish <shlomif@cpan.org> Shlomi Fish <shlomif@vipe.technion.ac.il>
Shoichi Kaji <skaji@cpan.org> Shoichi Kaji <skaji@cpan.org>
+Sidney Markowitz <sidney@sidney.com> Sidney Markowitz <sidney@sidney.com>
Simon Cozens <simon@netthink.co.uk> <simon@brecon.co.uk>
Simon Cozens <simon@netthink.co.uk> <simon@cozens.net>
Simon Cozens <simon@netthink.co.uk> <simon@othersideofthe.earth.li>
diff --git a/AUTHORS b/AUTHORS
index 25243bc6fb..6dc6482565 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -974,8 +974,8 @@ Mikhail Zabaluev <mhz@alt-linux.org>
Milosz Tanski <mtanski@gridapp.com>
Milton L. Hankins <mlh@swl.msd.ray.com>
Misty De Meo <mistydemeo@github.com>
-Mohammed El-Afifi <mohammed_elafifi@yahoo.com>
Mohammad S Anwar <Mohammad.Anwar@yahoo.com>
+Mohammed El-Afifi <mohammed_elafifi@yahoo.com>
Moritz Lenz <moritz@casella.verplant.org>
Moshe Kaminsky <kaminsky@math.huji.ac.il>
Mottaqui Karim <taqqui.karim@gmail.com>
@@ -1250,6 +1250,7 @@ Shirakata Kentaro <argrath@ub32.org>
Shishir Gundavaram <shishir@ruby.ora.com>
Shlomi Fish <shlomif@cpan.org>
Shoichi Kaji <skaji@cpan.org>
+Sidney Markowitz <sidney@sidney.com>
Simon Cozens <simon@netthink.co.uk>
Simon Glover <scog@roe.ac.uk>
Simon Leinen
@@ -1305,7 +1306,6 @@ Sven Strickroth <sven.strickroth@tu-clausthal.de>
Sven Verdoolaege <skimo@breughel.ufsia.ac.be>
Svyatoslav <razmyslov@viva64.com>
syber <syber@crazypanda.ru>
-Sidney Markowitz <sidney@sidney.com>
SynaptiCAD, Inc. <sales@syncad.com>
Sébastien Aperghis-Tramoni <sebastien@aperghis.net>
Sérgio Durigan Júnior <sergiodj@linux.vnet.ibm.com>