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)
1  2 
manifests/site.pp

Simple merge