Merge branch 'master' into processes
[collectd.git] / debian / collectd.manpages
2006-01-17 octoChanged version to 3.6.0