From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 7 May 2014 12:38:24 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~12
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=9c4f25d2a63f2d9d51bf8cc6d5a6293ff4d348cc;p=mkws-moved-to-github.git

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

9c4f25d2a63f2d9d51bf8cc6d5a6293ff4d348cc