chiark / gitweb /
Merge remote-tracking branch 'spwhitton/maint-merge-updates' into fix
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 19 Dec 2016 16:57:16 +0000 (16:57 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 19 Dec 2016 16:57:16 +0000 (16:57 +0000)

Trivial merge