From: Martin Zobel-Helas Date: Sun, 25 Jul 2010 22:13:02 +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=5b8208cd226e364b9d063c0406ace9e8d09c8ea2;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 5b8208cd226e364b9d063c0406ace9e8d09c8ea2