chiark / gitweb /
Merge branch 'master' into alt
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Apr 2018 16:18:23 +0000 (17:18 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Apr 2018 16:18:29 +0000 (17:18 +0100)
These are two identical ways to get the same result.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Trivial merge