# HG changeset patch
# User Chris Cannam
# Date 1474292802 -3600
# Node ID a2ca09e95f697d96e3a11ad7e2c3dd832fccace8
# Parent  44dc11ffa560e146b0c09d28ae679770632dcada# Parent  944a65cd431456ae5377630592b83babe75a3c5a
Merge from branch outputid-string-in-featureset