From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Dec 2012 11:07:40 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2c33d2f146d0889a98c6ac437503eae39c09d670;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

2c33d2f146d0889a98c6ac437503eae39c09d670