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

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

841726a9de1a59357270f33148e37255aa2e4486