From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 23 Nov 2012 14:31:19 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=0ffb158541a645c70567ba1cb0946d95c9656989;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

0ffb158541a645c70567ba1cb0946d95c9656989