Merge branch 'rs/rs-mailmap' into maint
commitac86677afb12947efb32668a6ae3cf8eaa7a1627
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:14 +0000 (18 14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:14 +0000 (18 14:19 +0900)
treedd4e60daf523baadc25b20e63bf5166f4f698e76
parentb0e5269c4eae3425be3cdc946c6414dfb886ae77
parent99b7b687a637d77b9079d478daee98ba3acebcba
Merge branch 'rs/rs-mailmap' into maint

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