From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 21 Jun 2017 09:05:40 +0000 (+0200)
Subject: Merge branch 'master' into postfix-change
X-Git-Tag: v0.1.0~2801
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=52f6434cc27ccd9a99a14f0fa3b0c644aed360dd;p=pixelpark%2Fhiera.git

Merge branch 'master' into postfix-change
---

52f6434cc27ccd9a99a14f0fa3b0c644aed360dd