From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 7 May 2018 09:47:44 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: 0.1.1~4
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d193da560d74e18f94a526bd634ccefb2373314a;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop'
---

d193da560d74e18f94a526bd634ccefb2373314a