From: Mike Taylor <mike@indexdata.com>
Date: Tue, 3 Jun 2014 15:14:35 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~556
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=b66b553f30e615de1ddf33d798f8d0cf574afbec

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

b66b553f30e615de1ddf33d798f8d0cf574afbec