]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commit
Merge branch 'develop'
authorHolger Levsen <holger@layer-acht.org>
Thu, 22 Aug 2013 16:11:38 +0000 (18:11 +0200)
committerHolger Levsen <holger@layer-acht.org>
Thu, 22 Aug 2013 16:11:38 +0000 (18:11 +0200)
commite961f4ec2055e38a27fee63fc214b340bfe9388b
treeaa8d602aba00e8d1811524ddded1322786e2557b
parentb9ff504139fe18f01048cbac1f18f59d778bb97a
parent9c926632774fdfba5d29dfb8261e8ffa30a3a3fa
Merge branch 'develop'

Conflicts resolved:
debian_build.py