From: Bernhard Tittelbach <bernhard@tittelbach.org>
Date: Tue, 13 Dec 2016 18:21:27 +0000 (+0100)
Subject: Merge commit 'e887b2ef14c8e00908310653e452d6f9247ea80d'
X-Git-Tag: MT2016-12-12
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=71f4b34f0210b91da2d55fa3f7a5b95dcd35c4ca;p=documents.git

Merge commit 'e887b2ef14c8e00908310653e452d6f9247ea80d'
---

71f4b34f0210b91da2d55fa3f7a5b95dcd35c4ca