From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 15 May 2012 17:22:25 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=0b5b5b85f994e4b35c18e51dffa6adaa916c6cdf;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

0b5b5b85f994e4b35c18e51dffa6adaa916c6cdf