From: Mike Taylor <mike@indexdata.com>
Date: Fri, 24 Oct 2014 09:56:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~114
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=290b9b0894c396120bbc9707428410e8da36708a

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

290b9b0894c396120bbc9707428410e8da36708a