From: Martin Zobel-Helas Date: Sun, 16 May 2010 16:20:32 +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=920d58fb60808410d6b32e15ffadfa28f2c1bb3d;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 920d58fb60808410d6b32e15ffadfa28f2c1bb3d