chiark / gitweb /
Merge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 14 Nov 2019 01:42:11 +0000 (01:42 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 14 Nov 2019 01:42:11 +0000 (01:42 +0000)

Trivial merge