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

Merge branch 'develop'
---

9c57c6ad5a3ded0544cb29350996c9d1d2b1cd8b