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

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

39713079244c0dbb977c4c04ee0d76eb18dc464f