Merge commit 'puzzle/development'
authormh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Fri, 13 Jun 2008 20:02:35 +0000 (20:02 +0000)
committermh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Fri, 13 Jun 2008 20:02:35 +0000 (20:02 +0000)
commit4f8fbfcc736d02ec0528b0df571d5d4a458c261e
tree9d24e887cccc04e27a1d41c1fb1b830451b30327
parent2c530ac300a57c54ce55dce73481693f93cc6e38
Merge commit 'puzzle/development'

git-svn-id: https://svn/ipuppet/trunk/modules/munin@1600 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
README
files/empty/.git_placeholder [new file with mode: 0644]
manifests/client.pp
manifests/init.pp
manifests/plugin.pp
templates/munin-node.conf.Debian.etch
templates/munin-node.conf.default