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

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

034500d2c96eb15ac5a0106c7f33be0ea86df705