From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 16 May 2012 18:16:09 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=b48fd3f10de152a8dd5b9e5169478bd87118bd1b;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'
---

b48fd3f10de152a8dd5b9e5169478bd87118bd1b