# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1404466657 -3600
# Node ID a8541380d3e05a05570e02dccffab3dcc23ee237
# Parent  585a7be09763aaca02a0553a799c276018c8aee8# Parent  9ba8af95980808f4417c3a14f14bd313a81bc389
Ah, we've already done this. Merge, taking everything from the branch with the older commits.