From: Mike Taylor <mike@indexdata.com>
Date: Tue, 30 Sep 2014 15:52:07 +0000 (+0100)
Subject: Merge
X-Git-Tag: 1.0.0~324
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=0d3c96837508e3b70025735342ecd5cbc2684070;p=mkws-moved-to-github.git

Merge
---

0d3c96837508e3b70025735342ecd5cbc2684070