# HG changeset patch
# User Chris Cannam
# Date 1475760792 -3600
# Node ID 77c34ecc4498c4673e4e016e52a97b32c9160040
# Parent  4a94e8a61d35cb3c009cc86526421d59e7bd6c3c# Parent  91d03c115ea08161a10d208f012c7cec74172986
Merge from branch jsonrpc