From: Martin Zobel-Helas Date: Sun, 29 Jul 2012 10:02:03 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dd13b76c85dcc89da5ec4eb8ba90f5a69b0dde4d;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: we want the output --- dd13b76c85dcc89da5ec4eb8ba90f5a69b0dde4d