# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1475760792 -3600
# Node ID 91fda9470ee26e6bfbb3dccfca71e7e25d11e66c
# Parent  6f160dee11923ccbceadae8d5ad3d8afa782d922# Parent  a5ba837bca28176161460374c65115b488597688
Merge from branch jsonrpc