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)
commit46c1aeb48f03f5eb0f761f0135de967a62986515
tree04cf490768bd8eaa37705b42dd971df1e7b8637a
parent2967c1c524242b26481985cf50b11821826f18d5
parent9853b7286eb2342e2abf30369df2bf265b7c9a0e
Merge remote-tracking branch 'github/master'
templates/munin-node.conf.default