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

Merge branch 'develop'
---

8870911a77a65be362e8c32124cad7e4b4a6d634