From: Mike Taylor <mike@indexdata.com>
Date: Fri, 6 Jun 2014 16:07:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~539
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=6fe698db81be9801c0ef62479dd030791a2e388a;hp=6fe698db81be9801c0ef62479dd030791a2e388a;p=mkws-moved-to-github.git

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