From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 10 Jul 2014 16:33:47 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~16
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=f1457a890d9d686a6a4acd04c81ed8a732a73a75;p=mkws-moved-to-github.git

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

f1457a890d9d686a6a4acd04c81ed8a732a73a75