# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1475758016 -3600
# Node ID bac1098dbd26184697b2fdd60f48af62c55762a3
# Parent  30bd89a8cbeb8e1f1820da4c7585a69162048f74# Parent  45fa68ee83ce083b923100799523d41f187c24ea
Merge from branch jsonrpc