Merge branch 'jn/mailmap-update'

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

Junio C Hamano committed Oct 16, 2018 at 16:16 UTC 3d560562ab1719bd62201cb8a436a3d60f95745a

No changes.