From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 12 May 2014 13:23:30 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~8
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=db2c897212597cb73357dd8def2922a9285bdacf;p=mkws-moved-to-github.git

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

db2c897212597cb73357dd8def2922a9285bdacf