From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 22 Jun 2012 13:44:42 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=b883920173337994710ba40702ab8c7e7b0ed51f;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

b883920173337994710ba40702ab8c7e7b0ed51f