# HG changeset patch
# User Chris Cannam
# Date 1444814388 -3600
# Node ID 7fb1a7199e5b63513b2a21453db2fc67e622e473
# Parent  e994747fb9dd1c253c6b80cedabedadb4e54be35# Parent  f8604a7c46606d2c09d03f4124b01908a0a5e373
Merge from branch "3.0-integration"