# HG changeset patch # User Chris Cannam # Date 1413204789 -3600 # Node ID ad425b9096bd668a31126b575a104e6ba2c062f8 # Parent ee56e3e9eeb565c0c25a8cee13cdd82854baa6c0# Parent 6b62bae0af33ffdb6db23ed1a2da2318e702b52e Merge from branch 'midi'