From: Mike Taylor <mike@indexdata.com>
Date: Wed, 22 Oct 2014 14:59:30 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~138^2~6
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=e57e1a47bd7f90509d61d65fbe2f6d2092478770

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

e57e1a47bd7f90509d61d65fbe2f6d2092478770