From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 8 Feb 2012 15:51:59 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=78b4948d7a51f00f21bbcab20f9a6ce0d3f59e7c;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

78b4948d7a51f00f21bbcab20f9a6ce0d3f59e7c