Merge branch 'ks/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Nov 2017 05:31:29 +0000 (14:31 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Nov 2017 05:31:29 +0000 (14:31 +0900)
commitc90766c4f1c216f6cbcb2fb7daf6ac4cced5b1df
treeea87accb19aa36932df133d76540246b0361d09e
parent57dd3dd28724a150e6c6d4c1c8363e1efd49c197
parentcd3f8e2fc2c90335c1b82ef041d8c03ac397eb1e
Merge branch 'ks/mailmap'

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