From: Mike Taylor <mike@indexdata.com>
Date: Mon, 11 Aug 2014 09:19:43 +0000 (+0100)
Subject: Merge branch 'master' into mike
X-Git-Tag: 1.0.0~39^2~7^2~4^2~46
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=694f4b8e3a4a60e0792c83a80578f373606b5406;p=mkws-moved-to-github.git

Merge branch 'master' into mike
---

694f4b8e3a4a60e0792c83a80578f373606b5406