# HG changeset patch
# User Chris Cannam
# Date 1444813979 -3600
# Node ID dc809248800511ef8e8c7501ace5a128a04d95df
# Parent  8588b97f1d1c324a9d2c14e646b07fc00442172f# Parent  89f44d182d379d5555954093016d32948db16b53
Merge from branch "tony-2.0-integration"