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

Merge branch 'develop'
---

47e3ec12b0edba3e4acfa1f870e0355c4d9e496d