Merge branch 'jn/mailmap-update'
commit3d560562ab1719bd62201cb8a436a3d60f95745a
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:01 +0000 (16 16:16 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2018 07:16:01 +0000 (16 16:16 +0900)
tree5b09920ca8cc000e9373c34e21bed430ee8cbf5b
parent52472c20d2748eddf6b241e5f9d44d1bf97f3cf6
parent255eb03edf6ebf7ce2de5994d3662e0ce7243b32
Merge branch 'jn/mailmap-update'

The mailmap file update.

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