From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 30 Apr 2013 16:48:00 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=2536fa553041e32d25b4cdbb7ea882804c2064d6;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' into develop

Conflicts:
	common_code.py
---

2536fa553041e32d25b4cdbb7ea882804c2064d6