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)
commit2a339e2b6661b0d6bfcd2617900e9f2657587583
tree7b3b7b1e289f03b43c9d4920746e08c41a31e7c0
parentdd56dd48cb4388e05aa32157fc57ce55ed559a68
parent85aa911142e91ee9340473846da91d84509164c3
Merge branch 'master' into alt

These are two identical ways to get the same result.

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