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

Merge branch 'develop'
---

669bf5a8a6cce99519f4076501c019086b0ec1cc