From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 24 Jan 2013 09:58:52 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b7231e14f083a1db7a40903e7e61a48d28811fbe;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

b7231e14f083a1db7a40903e7e61a48d28811fbe