# HG changeset patch
# User Chris Cannam
# Date 1395407742 0
# Node ID d886743cba619c3f50c03a3d6c86e0978a9fdc59
# Parent  523f55b47b98d0a075d6711206a6c1fd770be2c4# Parent  0fcf95cec43533c4bdd3aff97168e914e95b56c9
Merge