From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 9 Apr 2013 15:41:00 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=20532f587b1c4354f98fadf3641c29285aac4f42;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

20532f587b1c4354f98fadf3641c29285aac4f42