From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 22 Aug 2013 16:11:38 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=e961f4ec2055e38a27fee63fc214b340bfe9388b;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop'

Conflicts resolved:
	debian_build.py
---

e961f4ec2055e38a27fee63fc214b340bfe9388b