From: Mike Taylor <mike@indexdata.com>
Date: Fri, 1 May 2015 15:16:15 +0000 (+0100)
Subject: Merge branch 'master' into urlstate
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=28b3573df566d0a15ad96cb3c66a539c794f1a0c;p=mkws-moved-to-github.git

Merge branch 'master' into urlstate
---

28b3573df566d0a15ad96cb3c66a539c794f1a0c