# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1559735715 -3600
# Node ID 930b5b0f707d9e9fb5b172ca9df9b7ce858250c5
# Parent  e3335cb213da1e7b417a081fb109c014685c9439# Parent  f1070135c8ea55609cb5ca697deadceaa9dc7303
Merge branch 'codestyle-and-tidy'