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

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

e0097bcc301d00adac87eabfa2f1bb6b4be25255