From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 12 Oct 2012 10:15:28 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=2a5d6b83640b4eecc7410833f6c6221169b5a000;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

2a5d6b83640b4eecc7410833f6c6221169b5a000