From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 29 Jan 2013 18:08:15 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=997d331a895e54dd79f34eb2bae37678e33d346a;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

997d331a895e54dd79f34eb2bae37678e33d346a