From: nicoo <nicoo@realraum.at>
Date: Fri, 17 Nov 2017 13:15:08 +0000 (+0100)
Subject: Merge branch 'master' into ansible-fixup
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=605383e1bfc115b3133b105565593d565a9f740d;p=noc.git

Merge branch 'master' into ansible-fixup
---

605383e1bfc115b3133b105565593d565a9f740d