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

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

a62e9fbbe5f453c1566c35bce1a573d4619fb98d