]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sat, 5 Feb 2011 13:49:46 +0000 (13:49 +0000)
committerStephen Gran <steve@lobefin.net>
Sat, 5 Feb 2011 13:49:46 +0000 (13:49 +0000)

Trivial merge