From: Mike Taylor <mike@indexdata.com>
Date: Thu, 9 Oct 2014 15:12:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~258
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=c0fa14a68f3d3136d29b58fdd2d8b3f32dd7555a

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

c0fa14a68f3d3136d29b58fdd2d8b3f32dd7555a