# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1401659307 -7200
# Node ID c967b47fada464773b4c92bc42a8bafda5e844a8
# Parent  39ba98ecc020b095e63d9a3b51f16a65f79e7475# Parent  8dd72f06cb4a8d7f65b784fe9c5bcbfb45bca3f9
Merged branches.