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

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

f94787d8568fdec088368b6c9b985727b17c0fed