From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 24 Oct 2018 15:44:50 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.3.2^2~25
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=14f094efea6775483a0d5457eda79ae5eccef488;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'master' into develop
---

14f094efea6775483a0d5457eda79ae5eccef488