From: Mike Taylor <mike@indexdata.com>
Date: Tue, 15 Apr 2014 15:56:54 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~948
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=77e5325a13c369c4cfdaf45a924da61c20829186

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

77e5325a13c369c4cfdaf45a924da61c20829186