From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 15 Mar 2012 13:23:55 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://git.profitbricks.localdomain/srv/git/so/jenkins_build... 
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=89e231e3d3ab7ad833c46d073c5a0764ced21945;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'develop' of ssh://git.profitbricks.localdomain/srv/git/so/jenkins_build_script into develop

Conflicts:
	debian_build.py
---

89e231e3d3ab7ad833c46d073c5a0764ced21945