From: Mike Taylor <mike@indexdata.com>
Date: Wed, 2 Jul 2014 15:00:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~458
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=850fac179cc93c0393ed27bf1c9c2b4f204f07e4

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

850fac179cc93c0393ed27bf1c9c2b4f204f07e4