Merge branch 'jn/mailmap-update' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:47 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:47 +0000 (22:57 +0900)
The mailmap file update.

* jn/mailmap-update:
  mailmap: consistently normalize brian m. carlson's name

1  2 
.mailmap

diff --cc .mailmap
Simple merge