From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Dec 2012 17:00:45 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=26c590cdc15245b70bab0ff70aa13fb2ec595d1c;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

26c590cdc15245b70bab0ff70aa13fb2ec595d1c