# HG changeset patch
# User Chris Cannam
# Date 1403006118 -3600
# Node ID 5c4a405a70fcc3857c5adcfe834dea7eaab9f323
# Parent  5d2966b7c201500967f4132b20acabcb5ed4d96c# Parent  584b11df8e4f3447484153ed6bc391e370856933
Merge from branch "tonioni"