# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1474292923 -3600
# Node ID 5bc28c888d9af5be8f3d8cd1ea7634cdb621fe6b
# Parent  fb3912e09acfb4575228e74c9dec10b8a1a93925# Parent  a97aae321809e088d4d38a384d4c3a020c5f38b7
Merge from branch outputid-string-in-featureset