# HG changeset patch
# User Chris Cannam
# Date 1480068532 0
# Node ID 630c4a9885cac11c40ee4907f4e7cde612a8e988
# Parent  36aa947ec9629108da8abe39b37fb97c1e989514# Parent  287fce13a1aefc604e88f34a355ede7dc8306187
Merge from branch subdivide-instants