From: Wolfram Schneider <wosch@indexdata.dk>
Date: Mon, 21 Jul 2014 13:51:11 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into wosch
X-Git-Tag: 1.0.0~39^2~13
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=94edf22d8d8ce6f5437f9cc9aa922fc3c108b60d;p=mkws-moved-to-github.git

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

94edf22d8d8ce6f5437f9cc9aa922fc3c108b60d