# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1693612538 -7200
# Node ID cd0cd8f08c13db7b47554df6711b3834eae232f9
# Parent  69c9a31a68eef250ad87933002f9b2789eac8fe5# Parent  a0098443f677663369e2450d20a791fcb7e2ca14
Merged changes from the default branch.