Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 19:27:32 +0000 (21:27 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jul 2010 19:27:32 +0000 (21:27 +0200)
commit7aada4511d012b71f8378d2b5c0f35dc7a2a6dea
tree43e9368c553a848476ab60d4e05dc04086ff3762
parentc7adf91ce05c62584758102e602f33f52d7a6de2
parentbd3abb2346410d9fd8051309c8a838958966295b
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
manifests/site.pp