From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 13 Feb 2017 15:06:09 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.8.4~37
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=5a38eeea04609253df4792c0a6f6a89f5a6fdff2;p=pixelpark%2Fpuppetmaster-webhooks.git

Merge branch 'master' into develop
---

5a38eeea04609253df4792c0a6f6a89f5a6fdff2