# HG changeset patch
# User Chris Cannam
# Date 1481306515 0
# Node ID 4be200469a9c0a23987970f49e452bd61a216828
# Parent  4de547a5905ce355e046277713ca0f74c59839fc# Parent  2a1e9e017484ec0bf336bc22effc24c47b0e7ade
Merge from branch bqresample