# HG changeset patch
# User Chris Cannam
# Date 1413281611 -3600
# Node ID 04945e74d31497a4404ed985b8bdb859140d0076
# Parent  b3d73c08b6cefe4c98777d0c0381dcbac6e99c40# Parent  1a6eab755c81b8bb37f6300514fe91e2cfa81089
Merge from branch midi