From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Thu, 2 May 2013 08:43:12 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=7f272721e7198c6cf6be1ba5291fea9d0855b07b;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' into develop

Conflicts:
	common_code.py
	debian_build.py
---

7f272721e7198c6cf6be1ba5291fea9d0855b07b