From: Pat Thoyts <redacted>
Date: Thu, 20 Oct 2016 10:07:24 +0000 (+0100)
Subject: Merge branch 'os/preserve-author' into pu
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=bfe43447fb78d64c1cdf4b2046032a399edc4011;p=git.git

Merge branch 'os/preserve-author' into pu
---

bfe43447fb78d64c1cdf4b2046032a399edc4011