From: Mike Taylor <mike@indexdata.com>
Date: Thu, 23 Oct 2014 14:35:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~126
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=f6ab13587b58fba947e4257e7ff1091bbaffcb64;hp=--cc;p=mkws-moved-to-github.git

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

f6ab13587b58fba947e4257e7ff1091bbaffcb64