# HG changeset patch
# User Chris Cannam
# Date 1479742383 0
# Node ID 604f369c247a7af9448bd17a060315379d01ba66
# Parent  f50c0bbe90960b87f6ab3fd1661f5a9fb04c877a# Parent  bac86d3fc6c95e4af0ef95b664538f2517b46861
Merge from branch bqfft