From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 20 Oct 2017 13:41:45 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.8.4~9
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=fd1e7937653042856242f8daba27edb0c57bd18b;p=pixelpark%2Fpuppetmaster-webhooks.git

Merge branch 'master' into develop

Conflicts:
	lib/webhooks/__init__.py
---

fd1e7937653042856242f8daba27edb0c57bd18b