]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commit
Merge branch 'daily' of ssh://git/srv/git/jenkins_build_script into daily
authorMathias Klette <mathias.klette@profitbricks.com>
Wed, 31 Aug 2011 19:03:27 +0000 (21:03 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Wed, 31 Aug 2011 19:03:27 +0000 (21:03 +0200)
commit141cbe0bf71db3e9947cc2751cf50a558faac7a6
tree342441b7dbcc76b1d1cb1d35aad297972e3adf49
parentb767991e059dda05244b68089d4ffbc1ca183a7b
parent6d8c207e67ee97e78c8ec10b28fa7d0dde342601
Merge branch 'daily' of ssh://git/srv/git/jenkins_build_script into daily

Conflicts:
build.py
build.py