# HG changeset patch
# User Chris Cannam
# Date 1413368585 -3600
# Node ID 2a399bed0184502c2429672ca635ab0c249ec38e
# Parent  04945e74d31497a4404ed985b8bdb859140d0076# Parent  237ccacbb85ef652b03b8365a37f1eaf7c305b67
Merge from branch "labfile"