From: Mike Taylor <mike@indexdata.com>
Date: Thu, 12 Jun 2014 12:02:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~481
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=7dd527d916769c511bcc837b437facce83804af0

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

7dd527d916769c511bcc837b437facce83804af0