Code

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)
commita24bf968e72f9a103a354dcc833619a40849cfcd
treed19d4ae6e01a436ecd00ae1b1b02a3e23faadb08
parent26fbc23e518dcc74502ae3b2495112adc3840879
parent84b91b4402505a31da7b7a00cee4e97b1fc11906
Merge remote-tracking branch 'tokkee/sh/collectd-5.0' into collectd-5.0
src/collectd.conf.in