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

Merge branch 'develop'
---

e9c4dd28a0fe9ede1d1d5ff7312c0c17cca6aecd