Merge branch 'ks/mailmap' into maint

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

Junio C Hamano committed Nov 15, 2017 at 12:05 UTC 266b87b90bbb1e1add42ba70d30174db8b253b2b

No changes.