Merge branch 'bc/mailmap-self'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:10 +0000 (14:38 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:10 +0000 (14:38 +0900)
* bc/mailmap-self:
mailmap: update brian m. carlson's email address

Trivial merge