# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1497516721 -3600
# Node ID 8a031eb9a25ffb09801ddd120a5d547dec6bef51
# Parent  db929669e7d3564ec09cf41bf7ee347fa11233de# Parent  86d4310c2a623f618d43616a138d181a945e1aab
Merge branch 'output-type-uri'