From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 24 Apr 2014 14:44:05 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~20
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=7e041f64182dd9d2ca88e4c3e61f4ffbcd1c4535;p=mkws-moved-to-github.git

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

7e041f64182dd9d2ca88e4c3e61f4ffbcd1c4535