# HG changeset patch
# User Chris Cannam
# Date 1542205397 0
# Node ID 32bbb86094c3ceb2747ea68c04ef425b31ff78f4
# Parent  78eecb19e688b2d170e5542719d06bdade3697d9# Parent  4a36f613005699b1bce25b012ec3d07f7409b25d
Merge from branch spectrogramparam