From: Ben Harris <bjh21@bjh21.me.uk>
Date: Sun, 25 Jun 2017 22:39:14 +0000 (+0100)
Subject: Merge release-branch changes into the trunk.
X-Git-Tag: bedstead-001.003~30
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=2a9b39169b42b72c0051a7921bc8fabfe483effd;p=bedstead.git

Merge release-branch changes into the trunk.
---

2a9b39169b42b72c0051a7921bc8fabfe483effd