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

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

2a25ec1053cb99c12dbcf30259c1cc29b6dadb97