# HG changeset patch
# User Chris Cannam
# Date 1445251097 -3600
# Node ID fc726260b29ba1f7ff6d74ee6a91095a5ddac32a
# Parent  ceecc71eeb20346e5c8b74a6ab32915cb4aa7344# Parent  e9a92546b2ca019a4792b33ad353c71cebd500fd
Merge from branch "2.0-integration"