From: Mike Taylor <mike@indexdata.com>
Date: Thu, 22 May 2014 11:07:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~621
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=daa145f9793642b5545c99b3222f31fe3743c858;p=mkws-moved-to-github.git

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

daa145f9793642b5545c99b3222f31fe3743c858