]> git.donarmstrong.com Git - dsa-puppet.git/commit - manifests/site.pp
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 29 Jul 2012 10:02:03 +0000 (12:02 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 29 Jul 2012 10:02:03 +0000 (12:02 +0200)
commitdd13b76c85dcc89da5ec4eb8ba90f5a69b0dde4d
tree3c49aa92c272865fd532beb2591e1f7f03236b68
parent8c44f1ff36f152ff0ee42cc7f372b4a20a51739b
parent5cb1933757800bad9ba98090351aec972403e00d
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  we want the output