Merge branch 'sb/mailmap'

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

Junio C Hamano committed Jul 18, 2018 at 12:20 UTC bedb9145510240a48cfb2a9a28abf0f66683a941

No changes.