# HG changeset patch
# User Chris Cannam
# Date 1445260695 -3600
# Node ID 0ab091a4538f3adecdb91e760f9ecb38386dccb9
# Parent  a3d73feeb850dc66750f50bbfa7b9c4dfc10b45f# Parent  0409d903e756c386c6c0dd304d776bc5ad794902
Merge from branch "2.0-integration"