From: Thilo Fromm <thilo.fromm@profitbricks.com>
Date: Thu, 25 Apr 2013 13:22:45 +0000 (+0200)
Subject: Merge branch 'master' into feature/storage-auto-deploy
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3ad56ecca174bcd5d5130202662d842fb31e991f;p=profitbricks%2Fjenkins-build-scripts.git

Merge branch 'master' into feature/storage-auto-deploy

resolved Conflicts:
	extract_storage_kernel+modules.sh

Signed-off-by: Thilo Fromm <thilo.fromm@profitbricks.com>
---

3ad56ecca174bcd5d5130202662d842fb31e991f