Merge branch 'jn/mailmap-update' into maint

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

Junio C Hamano committed Nov 21, 2018 at 22:57 UTC f1814e02282860a85b0ca85092df08b4788103da

No changes.