From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 4 Jul 2014 10:42:50 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~26
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=4c28b602ea9f9cfa1cf867495f25db8a29e83877;p=mkws-moved-to-github.git

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

4c28b602ea9f9cfa1cf867495f25db8a29e83877