]> 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>
Sun, 25 Jul 2010 22:34:29 +0000 (23:34 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 25 Jul 2010 22:34:29 +0000 (23:34 +0100)

Trivial merge