summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-03-03 13:54:12 +0900
committerMasanori Itoh <itoumsn@nttdata.co.jp>2011-03-03 13:54:12 +0900
commit9bd08cb1d79d46dc988e902de0b4d4280738fdf0 (patch)
treec3ad6308a808534601405919394ece778b143362 /.mailmap
parentf617fc087367a3d65bd4b826bf735f65fec9d2fd (diff)
parent20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3 (diff)
downloadnova-9bd08cb1d79d46dc988e902de0b4d4280738fdf0.tar.gz
Merged to rev 757.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 9c1e082694..df012e0662 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,7 @@
<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
<jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
+<josh@jk0.org> <josh.kearney@rackspace.com>
<justin@fathomdb.com> <justinsb@justinsb-desktop>
<justin@fathomdb.com> <superstack@superstack.org>
<masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>