Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Tue, 27 Jul 2010 08:00:39 +0000 (09:00 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 27 Jul 2010 08:00:39 +0000 (09:00 +0100)
commit86b076a671944fa76ee3fe291be16a93982798e0
tree2739ff7e3567e4697f0c2b33a00310d45675ebaa
parent7a0ad0b46e8c854ea1233cc6a781683fd69fa47e
parent21a531b2f37e3319f66e63c9f6fa34004e55864c
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet