From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 12 Dec 2012 17:35:58 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=2628684800aab69bbad046298350da0a1e0c4b4a;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

2628684800aab69bbad046298350da0a1e0c4b4a