Merge branch 'bc/mailmap-self'
commite1dd23a8c9567daf98a726fc7a5d7578a7681bb4
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:10 +0000 (23 14:38 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:10 +0000 (23 14:38 +0900)
tree41813ad7f66750a8ea8f865c45b4c063e84dee7f
parenta2cec42213c55dd3ff9febb51612e3f1cab37b12
parentcd1e606badad291e5e75b111db67c999fcb766ab
Merge branch 'bc/mailmap-self'

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