# HG changeset patch
# User Chris Cannam
# Date 1460733975 -3600
# Node ID a1f410f895d3edf8008067a57d86f92b5da278de
# Parent  4018fc0189bc46bf36ce1961ae558377afff2c6e# Parent  2f628dc9a0b0ac0ccd3d8333e8bdbc541e88e0b2
Merge from branch pluginscan