From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 30 Apr 2013 17:47:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into feature/DEVINF-28
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=f06eaace44e274ea5036729218e7791f4b8934ac;p=profitbricks%2Fjenkins-build-scripts.git

Merge remote-tracking branch 'origin/develop' into feature/DEVINF-28

Conflicts:
	debian_build.py
---

f06eaace44e274ea5036729218e7791f4b8934ac