From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 6 Nov 2018 10:12:40 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: 1.6.4^2~113
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=b7142fdccfece66e57c4aebed7db16d44e05fe56;p=pixelpark%2Fpuppetmaster-webhooks.git

Merge branch 'master' into develop
---

b7142fdccfece66e57c4aebed7db16d44e05fe56