From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 5 Nov 2018 10:30:23 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Tag: 0.3.2^0
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=8d09860e3b9301278df0bfc59b8bbedd0b1d1e3c;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop'
---

8d09860e3b9301278df0bfc59b8bbedd0b1d1e3c