# HG changeset patch
# User Chris Cannam
# Date 1474292923 -3600
# Node ID bae6b03e12713841f2d42b0eaddd741a0b9be4a0
# Parent  d6725f1c323c54042150364b9359a0a78c217368# Parent  f6aae477b30fd7330eb0beaee14f3705c813c602
Merge from branch outputid-string-in-featureset