From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 12 Oct 2012 12:55:35 +0000 (+0200)
Subject: merge develop
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d09a2c658b9eed5e2d3443246568d6ef81f1585d;p=profitbricks%2Fjenkins-build-scripts.git

merge develop
---

d09a2c658b9eed5e2d3443246568d6ef81f1585d