From: Mike Taylor <mike@indexdata.com>
Date: Mon, 20 Oct 2014 12:53:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~155^2~1
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=8231043050cd8cfbc907296f7d5157221a1e00cc;p=mkws-moved-to-github.git

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

8231043050cd8cfbc907296f7d5157221a1e00cc