# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1693758087 -7200
# Node ID 5bf76974b487b7b8598e04db25fa5927e0e407b0
# Parent  c5b97b05f886e15ee873ff4bb382b584f9307e96# Parent  be8a103fdd9bfa05c9a57368c049e71fcf818e00
Merged branches.