Merge branch 'rs/rs-mailmap'
commit3d2a6dc9362ec974002f585c30efa51609da0bf4
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:23 +0000 (11 14:52 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Oct 2017 05:52:23 +0000 (11 14:52 +0900)
tree926b1254b24c493c2ff4f75f00f1925d3b15c10a
parent6defdc9fe863bd637102f8b5420501654d4a9346
parent99b7b687a637d77b9079d478daee98ba3acebcba
Merge branch 'rs/rs-mailmap'

* rs/rs-mailmap:
  .mailmap: normalize name for RenĂ© Scharfe