From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 23 Apr 2014 12:18:03 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~22
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=5940980da31aee2530b966c777e13f80a0a502b9;hp=b46c4b42269ecabe17260f983a70f4b68b68dd18;p=mkws-moved-to-github.git

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