# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1395407645 0
# Node ID 0fcf95cec43533c4bdd3aff97168e914e95b56c9
# Parent  4d8c768855c69c9e1df596d8c9247d0cf084e8e6# Parent  523f55b47b98d0a075d6711206a6c1fd770be2c4
Merge from branch cannam