From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 30 Apr 2013 13:35:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into testmerge
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=2666680131872036cadc39fe7148b31d613fe16f;p=profitbricks%2Fjenkins-build-scripts.git

Merge remote-tracking branch 'origin/develop' into testmerge
---

2666680131872036cadc39fe7148b31d613fe16f