From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 16 Apr 2014 15:02:37 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~27
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=ca452bc42c8f645cebb4d70f9be0b2864037118c;hp=ba3eeec06416b30b6cc00f19a9b8d362bb1c0700;p=mkws-moved-to-github.git

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