# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1475760792 -3600
# Node ID 2f621b00747ef2bb04ecdd64fc41ffbd110abcc9
# Parent  f272e46f561590ad6c96eb2bbc25fa7910dfb06e# Parent  9d20eb251fbc026208e66caf4fa9a40c9f045dcb
Merge from branch jsonrpc