From: Mike Taylor <mike@indexdata.com>
Date: Tue, 30 Jun 2015 11:02:21 +0000 (+0100)
Subject: Merge branch 'master' into urlstate
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=refs%2Fheads%2Furlstate;p=mkws-moved-to-github.git

Merge branch 'master' into urlstate
---

e4af8e75a13ff5a6db0b88e389beb9e4a27ef1ad