From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 25 Oct 2019 08:42:22 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: 2.1.2~7
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=1971e816e4086dcb666804b37f06be50b1eec4b3;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop'
---

1971e816e4086dcb666804b37f06be50b1eec4b3