]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commit
Merge branch 'master' into develop
authorMathias Klette <mathias.klette@profitbricks.com>
Thu, 2 May 2013 08:43:12 +0000 (10:43 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Thu, 2 May 2013 08:43:12 +0000 (10:43 +0200)
commit7f272721e7198c6cf6be1ba5291fea9d0855b07b
tree224362220d64ee9f0b6e936aba34eaf4166c1fcd
parentb707b2d910f06d410997bac74ac990a5a35217dd
parent17930bc44c94a4a92810aad11c5d6a8e0de7c104
Merge branch 'master' into develop

Conflicts:
common_code.py
debian_build.py