From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 28 Oct 2014 08:08:15 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~5
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=73ac16ce76c603671036c87f2d27652d6d78bc71;p=mkws-moved-to-github.git

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

73ac16ce76c603671036c87f2d27652d6d78bc71