summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 0af00f53f0..d74f50d4c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -435,6 +435,7 @@ Jody Belka <dev-perl@pimb.org> knew-p5p@pimb.org <knew-p5p@pimb.org>
Joe Buehler <jbuehler@hekimian.com> <jhpb@hekimian.com>
Joe McMahon <mcmahon@ibiblio.org> <mcmahon@metalab.unc.edu>
Joe McMahon <mcmahon@ibiblio.org> Joe McMahon <joe.mcmahon@gmail.com>
+Joe McMahon <mcmahon@ibiblio.org> Joe McMahon <joemcmahon@tekili-li.local>
John Heidemann <johnh@isi.edu> johnh@isi.edu <johnh@isi.edu>
John Hughes <john@atlantech.com> John Hughes <john@titanic.atlantech.com>
John L. Allen <allen@grumman.com> John L. Allen <allen@gateway.grumman.com>