From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 7 Nov 2014 17:34:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~3
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=a9756ba00b3c22326540870d3ab410f9a0c0f94a;p=mkws-moved-to-github.git

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

a9756ba00b3c22326540870d3ab410f9a0c0f94a