From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 22 Oct 2014 16:29:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into mkws-294
X-Git-Tag: 1.0.0~138
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=e41cdaf18a6fa7cb61034c77902cb2b0177eb108;p=mkws-moved-to-github.git

Merge remote-tracking branch 'origin/master' into mkws-294
---

e41cdaf18a6fa7cb61034c77902cb2b0177eb108