From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 29 Apr 2014 09:23:31 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~16
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=879ac5e92cfb287ff4e0126ed1e9b5abaf0ff077;p=mkws-moved-to-github.git

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

879ac5e92cfb287ff4e0126ed1e9b5abaf0ff077