Merge branch 'rs/rs-mailmap' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:14 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:14 +0000 (14:19 +0900)
* rs/rs-mailmap:
.mailmap: normalize name for René Scharfe

Trivial merge