From: Wolfram Schneider <wosch@indexdata.dk>
Date: Sat, 19 Apr 2014 08:05:47 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~23
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=cd7c1d855215ed2f657d3ba3fe65525dd1e278e2;p=mkws-moved-to-github.git

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

cd7c1d855215ed2f657d3ba3fe65525dd1e278e2