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)
commitb8f98f418cbf5ee93139774880b4d4069fdd38a7
tree32d554a530cc247ae9864e7fa375eeec814b4895
parent24ee72609dd31a0bb315c5db7a23b140a8511e88
parentc9767fe6daf8ff0cf14e9c36a541c9357f702218
pseudo-merge branch 'v1-stand'

-s ours, declare fast forward