From: Bernhard Tittelbach <bernhard@tittelbach.org>
Date: Thu, 17 Nov 2016 16:14:34 +0000 (+0100)
Subject: Merge branch 'MT2016-11-14'
X-Git-Tag: MT2016-12-12~10
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=5a5788d49aba96cfbe4a588017409f725a2e1610;p=documents.git

Merge branch 'MT2016-11-14'
---

5a5788d49aba96cfbe4a588017409f725a2e1610