Merge branch 'ks/mailmap' into maint
commit266b87b90bbb1e1add42ba70d30174db8b253b2b
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:05:04 +0000 (15 12:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:05:04 +0000 (15 12:05 +0900)
tree63c611923e871f68484963c598600a83d0a7c472
parent2d35c507d26061090f76a668ccfb6f2662abc004
parentcd3f8e2fc2c90335c1b82ef041d8c03ac397eb1e
Merge branch 'ks/mailmap' into maint

* ks/mailmap:
  mailmap: use Kaartic Sivaraam's new address