Merge branch 'pull/collectd-4.0' into collectd-4.0
[collectd.git] / src / collectd.c
2005-12-01 octoRRDs and PID file are now underneath `localstatedir'