From: Mathias Klette Date: Fri, 14 Jun 2013 11:15:42 +0000 (+0200) Subject: Merge branch 'feature/storage-feature-branch' of ssh://git/srv/git/so/jenkins_build_s... X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=960bc21991ead760c11da6512c0bd6b4307b722b;p=profitbricks%2Fjenkins-build-scripts.git Merge branch 'feature/storage-feature-branch' of ssh://git/srv/git/so/jenkins_build_script into feature/storage-feature-branch Conflicts: extract_storage_kernel+modules.sh --- 960bc21991ead760c11da6512c0bd6b4307b722b