Merge branch 'master' into processes
[collectd.git] / debian / collectd.conffiles
1 etc/collectd.conf