# HG changeset patch
# User Chris Cannam
# Date 1453206878 0
# Node ID 36de09aaa614e00d1501fbb57753b4db9c9daa74
# Parent  224a6f55445dcc33d41437347eeffb3140858b5a# Parent  6fcb632384bafc7aadb9d15d0cdd10d43b38eb20
Merge from branch plugin-startup-test