From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 15 May 2014 11:28:49 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~7
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=0d023cdd6c0cfbfbd5ba91fb1a9ccd0077ef5b8e;p=mkws-moved-to-github.git

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

0d023cdd6c0cfbfbd5ba91fb1a9ccd0077ef5b8e