From: nicoo <nicoo@realraum.at>
Date: Sat, 24 Nov 2018 15:12:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'realraum/master'
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;ds=inline;h=390895728a662cbb4d20738e1d7550d60af0f418;p=noc.git

Merge remote-tracking branch 'realraum/master'
---

390895728a662cbb4d20738e1d7550d60af0f418