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)
git-svn-id: https://rfd.cronopios.org/ipuppet/trunk/modules/munin@1600 d66ca3ae-40d7-4aa7-90d4-87d79ca94279

1  2 
README

diff --cc README
Simple merge