From: Wolfram Schneider <wosch@indexdata.dk>
Date: Thu, 7 Aug 2014 12:03:02 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~11
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=547b7c24599333326debc1e4a3683c30de0f9080;p=mkws-moved-to-github.git

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

547b7c24599333326debc1e4a3683c30de0f9080