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

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

0810b52cbeda29b2821ce4779615599a4bb316f2