Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:03:35 +0000 (12:03 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 28 Jan 2012 11:03:35 +0000 (12:03 +0100)
1  2 
src/collectd.conf.in

Simple merge