# HG changeset patch
# User Chris Cannam
# Date 1481306515 0
# Node ID 6605984fa98f40534b2706555979a16592733850
# Parent  db90fee630bc756c3c64a6f904b551acb13e000f# Parent  e0ac21f07ab02388c50ff2ad40da73b27ce9ae87
Merge from branch bqresample