# HG changeset patch
# User Chris Cannam
# Date 1499692999 -3600
# Node ID a533662c17f4647e2700e53811bdf91c0ff173db
# Parent  09751743647e132cec557ef85654fe8436acae54# Parent  e7e626a87a1ef03ba474c25a3c5ae886738c134e
Merge from branch "scale-ticks"