From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 18 Apr 2014 18:02:40 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~621^2~24
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=5294a8b6b24298d327f9db1c9e733df09e2b5c84

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

5294a8b6b24298d327f9db1c9e733df09e2b5c84