# HG changeset patch
# User Chris Cannam
# Date 1425029377 0
# Node ID cca298ecfc7239be2a2f1e7f7311ddc4979ffb3a
# Parent  a68204b9a529352a0042a9343f99b0d2b64c9ffc# Parent  082ff90f1c82636c294963dd13f95b17fe99a6fe
Merge from branch re-minimise