Merge branch 'rs/rs-mailmap' into maint

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

Junio C Hamano committed Oct 18, 2017 at 14:19 UTC ac86677afb12947efb32668a6ae3cf8eaa7a1627

No changes.