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

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

aff3dffc410cc1ab5d5fdf60402d803351e28338