From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 16 Oct 2012 14:03:22 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=386a310997fbbc87d906cc82ee39470cffcfbfea;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

386a310997fbbc87d906cc82ee39470cffcfbfea