From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 13 Sep 2018 13:58:12 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.3.2^2~45
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=2f2547efbe1b9f7b73b32f8188743555dd919258;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'master' into develop
---

2f2547efbe1b9f7b73b32f8188743555dd919258