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

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

ac631fa1fa1ce18a4b878537a14fd99c9754aef5