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

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

d13fec8dd2b8ad0c9a898e63c4b69fbc51bb5672