From: Mike Taylor <mike@indexdata.com>
Date: Thu, 9 Oct 2014 12:11:46 +0000 (+0100)
Subject: Merge
X-Git-Tag: 1.0.0~274
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=f040336ce307386f952c7bd0dc7a0a31a1082d9e;hp=f040336ce307386f952c7bd0dc7a0a31a1082d9e;p=mkws-moved-to-github.git

Merge
---