Merge branch 'sb/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:35 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:35 +0000 (12:20 -0700)
commitbedb9145510240a48cfb2a9a28abf0f66683a941
treed8e4784615f1f6c4bb917a212cc9338cdfb3ef73
parent18f2717578853edfdaed5fb7361b5f992a68a79e
parent88a8ecaeaa87a84100c4eb49fb9af7a77977cc1b
Merge branch 'sb/mailmap'

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