]> 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>
Fri, 25 Mar 2011 07:19:01 +0000 (07:19 +0000)
committerStephen Gran <steve@lobefin.net>
Fri, 25 Mar 2011 07:19:01 +0000 (07:19 +0000)

Trivial merge