# HG changeset patch
# User Chris Cannam
# Date 1539339449 -3600
# Node ID 2e3b3fadba27e904a4f00d2c6efc83a4f6c0abb3
# Parent  e7da9c9635ba053aa30bcd6c170559b68ba87aa1# Parent  e848ea0850fe4c39d2fd82676706558377e12090
Merge