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

Merge branch 'develop'
---

a260d1871702903be79df3927316d8306ed66146