Merge branch 'bc/mailmap-self'

* bc/mailmap-self: mailmap: update brian m. carlson's email address

Junio C Hamano committed May 23, 2018 at 14:38 UTC e1dd23a8c9567daf98a726fc7a5d7578a7681bb4

No changes.