From: Stephen Gran Date: Tue, 29 Mar 2011 19:12:11 +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/?a=commitdiff_plain;h=816f97a070a1f8e1d2b89492697a7d9288ffe846;p=dsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 816f97a070a1f8e1d2b89492697a7d9288ffe846