From: Mike Taylor <mike@indexdata.com>
Date: Mon, 13 Oct 2014 16:02:20 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~237
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=b4b95c58a3227fc09ab9b8694e0187873019bd01

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
---

b4b95c58a3227fc09ab9b8694e0187873019bd01