From: Mike Taylor <mike@indexdata.com>
Date: Wed, 15 Oct 2014 10:09:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
X-Git-Tag: 1.0.0~198^2~12
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=5418e33df9754174bc29db35d28c9075d5b2212d;hp=5418e33df9754174bc29db35d28c9075d5b2212d;p=mkws-moved-to-github.git

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