From: Mike Taylor <mike@indexdata.com>
Date: Tue, 9 Sep 2014 12:44:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~324^2~26^2~8
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=4898fb8bfe605439a94a7663c98c663d49c24c79

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

4898fb8bfe605439a94a7663c98c663d49c24c79