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

Merge branch 'develop'
---

d0894b3f304b06578dfc21866f6bc5b20229e194