# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1378396210 -3600
# Node ID 5b8bd53fd65c66368ce427f3af77e463ccb7e7ef
# Parent  c28ce1a71a2238a79b5c406db3f26b5eb0df90ae# Parent  fa92d13876d007069bac14be954a0bcbd307d13d
Merge from luisf branch