From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 23 Jan 2013 14:19:26 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=33d1a4ca02fb0949d5fd1f2a161880c75f23cf03;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

33d1a4ca02fb0949d5fd1f2a161880c75f23cf03