Merge remote-tracking branch 'github/master'
authormh <mh@immerda.ch>
Mon, 3 Jun 2013 20:41:10 +0000 (22:41 +0200)
committermh <mh@immerda.ch>
Mon, 3 Jun 2013 20:41:10 +0000 (22:41 +0200)
1  2 
templates/munin-node.conf.default

Simple merge