# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1371809955 -3600
# Node ID e5d5cb1bc3be42d2cc0bfe68c6246265e0b34bb2
# Parent  b61a51fb42b9d424543f70f2ea38406de6700a31# Parent  9dbf79aee6dad3dbc8a55cb33d5f68244d0cb622
Merge from branch cannam