From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 12 Feb 2019 10:02:03 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Tag: 1.1.1^0
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=0d90f5426f9cb1539fe5cbbe623492f8fff9c4bd;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop'
---

0d90f5426f9cb1539fe5cbbe623492f8fff9c4bd