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

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

5051adc5354fe4267c1b3532b088384dcb57f9fb