From: Mike Taylor <mike@indexdata.com>
Date: Thu, 9 Oct 2014 11:51:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~277
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=54a6bb8b88e2cc2346d8bd0d4ef1e2ba44e3b069

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

54a6bb8b88e2cc2346d8bd0d4ef1e2ba44e3b069