# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1395409069 0
# Node ID a983b92b2fc1b6c4ec99c5f9fd4f522130d5c421
# Parent  0fcf95cec43533c4bdd3aff97168e914e95b56c9# Parent  9f37f7e39d3cfd10e4c8aa498c67066f32ffcd3c
Merge from branch cannam