From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 7 May 2014 14:25:32 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~11
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=db039259ace9fecb45fbee5ad9dd0b891ca64f9d;p=mkws-moved-to-github.git

Merge remote branch 'origin/master' into wosch
---

db039259ace9fecb45fbee5ad9dd0b891ca64f9d