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

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

9ab674f3d10735e310623488cad03269c4c28bd5