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

Merge branch 'develop'
---

0a7cd2000754894d0214a9bdcbf3047bcfca5690