From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 21 Feb 2012 17:31:29 +0000 (+0100)
Subject: merge develop branch
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=edfdfce700a11e4b189514e1fdf37b0003ccc9d6;p=profitbricks%2Fjenkins-build-scripts.git

merge develop branch
---

edfdfce700a11e4b189514e1fdf37b0003ccc9d6