]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
Merge branch 'feature/storage-feature-branch' of ssh://git/srv/git/so/jenkins_build_s...
authorMathias Klette <mathias.klette@profitbricks.com>
Fri, 14 Jun 2013 11:15:42 +0000 (13:15 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Fri, 14 Jun 2013 11:15:42 +0000 (13:15 +0200)
Conflicts:
extract_storage_kernel+modules.sh


Trivial merge