Merge branch 'master' of https://github.com/averni/puppet-munin into averni-master
authormh <mh@immerda.ch>
Fri, 13 Jun 2014 09:21:24 +0000 (11:21 +0200)
committermh <mh@immerda.ch>
Fri, 13 Jun 2014 09:21:24 +0000 (11:21 +0200)

Trivial merge