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)
commit44a5e04998648fc84ff1671d599c404f89bfadc6
treeb96c04cfc6e14a2aff147518c690480f62533657
parent084b46670a54c326944b9051e401bc3c4b14da7d
parent5b8208cd226e364b9d063c0406ace9e8d09c8ea2
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet