Merge branch 'sb/mailmap'
authorJunio C Hamano <redacted>
Wed, 18 Jul 2018 19:20:35 +0000 (12:20 -0700)
committerJunio C Hamano <redacted>
Wed, 18 Jul 2018 19:20:35 +0000 (12:20 -0700)
* sb/mailmap:
  .mailmap: merge different spellings of names


Trivial merge
git clone https://git.99rst.org/PROJECT