From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Dec 2012 09:48:41 +0000 (+0100)
Subject: merge into master
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=9072af9997449e34f201e12edb7b74a4a9bd40e2;p=profitbricks%2Fjenkins-build-scripts.git

merge into master
---

9072af9997449e34f201e12edb7b74a4a9bd40e2