# HG changeset patch
# User Chris Cannam
# Date 1542205313 0
# Node ID 50fe6d6a5ef0336c11a66eacfb346b3bc87e9aae
# Parent  410819150cd3b2f36dd4c31a1f2efde5eb717d5f# Parent  0f62bce0f0be7e07877b2cedc1817f299092583a
Merge from branch spectrogramparam