# HG changeset patch
# User Chris Cannam
# Date 1535724897 -3600
# Node ID ad02dff8ebfb3bfe3d0ebf6a429994a24c162036
# Parent  a28b19b136e869442bc17cc81731bc273e0d0f20# Parent  0f7df035192d66cfb32494f71e98da814936ea9b
Merge from branch errorcode