summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ac6f75f88..f97171d8d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,7 +37,8 @@
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
<johannes.erdfelt@rackspace.com> <johannes@compute3.221.st>
-<josh@jk0.org> <josh.kearney@rackspace.com>
+<josh.kearney@pistoncloud.com> <josh.kearney@rackspace.com>
+<josh.kearney@pistoncloud.com> <josh@jk0.org>
<justin@fathomdb.com> <justinsb@justinsb-desktop>
<kshileev@gmail.com> <kshileev@griddynamics.com>
<lorin@nimbisservices.com> <lorin@isi.edu>