From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 13 Sep 2018 13:40:11 +0000 (+0200)
Subject: Merge branch 'hotfix/blacklist-ds'
X-Git-Tag: 0.1.1^0
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=12add0f2db0f4e5dc05c65d25791dd99a7f8e5d4;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'hotfix/blacklist-ds'
---

12add0f2db0f4e5dc05c65d25791dd99a7f8e5d4