From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 6 May 2014 07:07:06 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~13
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=40c4cf423007caf35606c53b39f16958e0c55010;hp=-c;p=mkws-moved-to-github.git

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

40c4cf423007caf35606c53b39f16958e0c55010