From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 16 May 2018 15:33:17 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.1.1~3
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=34dce185b58ca6f86eaeaebfa02bb3cfea85b837;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop'
---

34dce185b58ca6f86eaeaebfa02bb3cfea85b837