# HG changeset patch
# User Chris Cannam
# Date 1487869526 0
# Node ID 9b52f1a952b5ea62810aedbf99e2ad884ea6e580
# Parent  0d45fff7ccd1177d7da1c3902665388bf2e34eac# Parent  b061b9f8fca5b839057cbbbcea6f19a24bddb52a
merge