From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 24 May 2012 11:03:11 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=214cdff8ebe074f285aa19928d4c3cf1eef34a70;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' into develop
---

214cdff8ebe074f285aa19928d4c3cf1eef34a70