From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 6 Sep 2012 17:19:39 +0000 (+0200)
Subject: merge changes from develop
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=d96116a60082879e05138639eff34cf08ac8c631;p=profitbricks%2Fjenkins-build-scripts.git

merge changes from develop
---

d96116a60082879e05138639eff34cf08ac8c631