From: Tobias von der Krone <tobias.vonderkrone@profitbricks.com>
Date: Wed, 22 Jan 2014 13:37:15 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=dc2ed4112449e13bddd32ffd8fbfe258ce7f4792;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' into develop
---

dc2ed4112449e13bddd32ffd8fbfe258ce7f4792