From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 7 Apr 2014 16:04:18 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~995^2~5^2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=5a460ea2b5cb337084b500910e191d0276a50bb8

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

5a460ea2b5cb337084b500910e191d0276a50bb8