# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1497516676 -3600
# Node ID 01b5abe6f1701a81839d6164f4a3a9a7e5cfaccd
# Parent  6a447d0318d325e23ee1f5af3100fa35710e51b0# Parent  5c009d5a88a6f0a19be71cd6edaae7db1eb1839a
Merge branch 'output-type-uri'