From: Junio C Hamano <redacted>
Date: Wed, 18 Jul 2018 19:20:35 +0000 (-0700)
Subject: Merge branch 'sb/mailmap'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=bedb9145510240a48cfb2a9a28abf0f66683a941;p=git.git

Merge branch 'sb/mailmap'

* sb/mailmap:
  .mailmap: merge different spellings of names
---

bedb9145510240a48cfb2a9a28abf0f66683a941