Merge branch 'ks/mailmap' into maint

gitster · gitster · commit 266b87b90bbb · 2017-11-15T12:05:04.000+09:00
* ks/mailmap:
  mailmap: use Kaartic Sivaraam's new address
diff --git a/.mailmap b/.mailmap
@@ -113,6 +113,7 @@ Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
 Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
 Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
 Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
+Kaartic Sivaraam <kaartic.sivaraam@gmail.com> <kaarticsivaraam91196@gmail.com>
 Karl Wiberg <kha@treskal.com> Karl  Hasselström
 Karl Wiberg <kha@treskal.com> <kha@yoghurt.hemma.treskal.com>
 Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>

-Original file line number
+Diff line change
 Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
 +Kaartic Sivaraam <[email protected]> <[email protected]>
 Karl Wiberg <[email protected]> Karl  Hasselström
 Karl Wiberg <[email protected]> <[email protected]>
 Karsten Blees <[email protected]> <[email protected]>