# HG changeset patch
# User Chris Cannam
# Date 1454584356 0
# Node ID 545796e9c658084c93e4ec32b16655158130dc3f
# Parent  58ba8c9e7675fc8237641bf9646e4a8ddee57202# Parent  ecb946764afea0669c8195bfdaa39ce7c7d51440
Merge from branch "spectrogram-minor-refactor"