From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 10 Jul 2014 15:37:10 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~17
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=fd43004e29d575552d45f7285085028f6be6fa1b;p=mkws-moved-to-github.git

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

fd43004e29d575552d45f7285085028f6be6fa1b