From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 19 Apr 2018 15:48:43 +0000 (+0200)
Subject: Merge branch 'develop' of git.pixelpark.com:ppadmin/create-vmware-tpl into develop
X-Git-Tag: 0.1.1~7^2~6
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=8642650ab3623e2b3f390216b13dfe8596beeb09;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'develop' of git.pixelpark.com:ppadmin/create-vmware-tpl into develop
---

8642650ab3623e2b3f390216b13dfe8596beeb09