From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Fri, 25 May 2012 11:54:28 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git/srv/git/so/jenkins_build_script
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=edfdcef2237cb54aff963b641b2f10ca68eddaa5;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' of ssh://git/srv/git/so/jenkins_build_script

Conflicts:
	debian_build.py
---

edfdcef2237cb54aff963b641b2f10ca68eddaa5