chiark / gitweb /
pseudo-merge branch 'v1-stand'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 5 Nov 2017 16:48:40 +0000 (16:48 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 5 Nov 2017 16:48:40 +0000 (16:48 +0000)
-s ours, declare fast forward


Trivial merge