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

Merge branch 'develop'
---

aca7c80032bac7c97c5dac3583b215ff710543ea