]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
Merge branch 'develop' of ssh://git.profitbricks.localdomain/srv/git/so/jenkins_build...
authorHolger Levsen <holger@layer-acht.org>
Thu, 15 Mar 2012 13:23:55 +0000 (14:23 +0100)
committerHolger Levsen <holger@layer-acht.org>
Thu, 15 Mar 2012 13:23:55 +0000 (14:23 +0100)
Conflicts:
debian_build.py


Trivial merge