From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 30 Apr 2013 15:22:46 +0000 (+0200)
Subject: Merge branch 'feature/DEVINF-358' into develop
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=df1aa12b2f80097380c1daceff0091354e542e51;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'feature/DEVINF-358' into develop

Conflicts:
	debian_build.py
---

df1aa12b2f80097380c1daceff0091354e542e51