summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 2068498f34..8d78e610b2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -728,6 +728,7 @@ Hans Mulder <hansmu@xs4all.nl> Hans Mulder <hansm@icgned.nl>
Hans Mulder <hansmu@xs4all.nl> Hans Mulder <hansmu@xs4all.nl>
Hans Mulder <hansmu@xs4all.nl> Unknown Contributor <hansm@euronet.nl>
Hans Ranke <hans.ranke@ei.tum.de> Hans Ranke <hans.ranke@ei.tum.de>
+Harald Jörg <harald.joerg@arcor.de> Harald Jörg <haj@posteo.de>
Harald Jörg <harald.joerg@arcor.de> Harald Jörg <harald.joerg@arcor.de>
Harmen <harm@dds.nl> Harmen <harm@dds.nl>
Harri Pasanen <harri.pasanen@trema.com> Harri Pasanen <harri.pasanen@trema.com>
@@ -1178,6 +1179,7 @@ Mark P. Lutz <mark.p.lutz@boeing.com> <mark.p.lutz@boeing.com>
Mark P. Lutz <mark.p.lutz@boeing.com> Mark P Lutz <tecmpl1@triton.ca.boeing.com>
Mark Pease <peasem@primenet.com> Mark Pease <peasem@primenet.com>
Mark Pizzolato <mark@infocomm.com> Mark Pizzolato <mark@infocomm.com>
+Mark Shelor <mshelor@cpan.org> Mark Shelor <mshelor@cpan.org>
Mark Stosberg <mark@summersault.com> Mark Stosberg <mark@summersault.com>
Marko Asplund <aspa@merlot.kronodoc.fi> Marko Asplund <aspa@merlot.kronodoc.fi>
Markus Jansen <markus.jansen@ericsson.com> Markus Jansen <markus.jansen@ericsson.com>
@@ -1676,6 +1678,7 @@ Simon Cozens <simon@netthink.co.uk> <simon@simon-cozens.org>
Simon Cozens <simon@netthink.co.uk> Simon Cozens <simon@netthink.co.uk>
Simon Glover <scog@roe.ac.uk> Simon Glover <scog@roe.ac.uk>
Simon Schubert <corecode@fs.ei.tum.de> Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
+Sinan Unur <sinan@unur.com> A. Sinan Unur <sinan@unur.com>
Sinan Unur <sinan@unur.com> Sinan Unur <sinan@unur.com>
Sisyphus <sisyphus@cpan.org> <sisyphus359@gmail.com>
Sisyphus <sisyphus@cpan.org> Sisyphus <sisyphus1@optusnet.com.au>