From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 24 May 2012 11:02:00 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=b60b7d1895fefdbf9fafee582def4858829b9d28;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

b60b7d1895fefdbf9fafee582def4858829b9d28