summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2015-10-02 17:06:49 -0700
committerJohn Dickinson <me@not.mn>2015-10-02 21:28:15 -0700
commit47eb6a37f86f29c355297b556c2ff898c98da9b2 (patch)
treeaea4acb77ca13e18badd784ac1cbe02becb5b3b2 /.mailmap
parentab78b2409a0c21aab783ce184fadda32bab9d8b3 (diff)
downloadswift-47eb6a37f86f29c355297b556c2ff898c98da9b2.tar.gz
authors and changelog update for 2.5.02.5.0
Change-Id: Id20b9340a017922b29d8bf9558825697a7f1f6f1
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 717b0ec36..f72ff441e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -81,3 +81,5 @@ Alexandra Settle <alexandra.settle@rackspace.com>
Kenichiro Matsuda <matsuda_kenichi@jp.fujitsu.com>
Atsushi Sakai <sakaia@jp.fujitsu.com>
Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
+Nakagawa Masaaki <nakagawamsa@nttdata.co.jp> nakagawamsa
+Romain Le Disez <romain.ledisez@ovh.net> Romain LE DISEZ