Sync with maint
authorJunio C Hamano <redacted>
Mon, 27 Jan 2020 21:26:07 +0000 (13:26 -0800)
committerJunio C Hamano <redacted>
Mon, 27 Jan 2020 21:26:07 +0000 (13:26 -0800)
* maint:
  .mailmap: fix erroneous authorship for Johannes Schindelin


Trivial merge
git clone https://git.99rst.org/PROJECT