From: Stephen Gran Date: Tue, 27 Jul 2010 08:00:39 +0000 (+0100) Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=86b076a671944fa76ee3fe291be16a93982798e0 Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 86b076a671944fa76ee3fe291be16a93982798e0