From: Mike Taylor <mike@indexdata.com>
Date: Tue, 20 May 2014 11:02:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~646
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=171724dc9176224a87038107763d9005a14e1483

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

171724dc9176224a87038107763d9005a14e1483