From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 14 Nov 2012 18:04:42 +0000 (+0100)
Subject: merge develop
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d869754d1d100ab2c14de9877d57b0eb97f364d5;p=profitbricks%2Fjenkins-build-scripts.git

merge develop
---

d869754d1d100ab2c14de9877d57b0eb97f364d5