From: Martin Zobel-Helas Date: Mon, 4 Jan 2010 22:02:18 +0000 (+0100) 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/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=8ccf0c5a44fa4771bd7b9d7eac06c9d73e0a77ad Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet into staging --- 8ccf0c5a44fa4771bd7b9d7eac06c9d73e0a77ad