From: Mike Taylor <mike@indexdata.com>
Date: Fri, 25 Apr 2014 16:25:48 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~841
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=6f905c7634b188ac07d3450709bca7a2ca6752b1;p=mkws-moved-to-github.git

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

6f905c7634b188ac07d3450709bca7a2ca6752b1