Merge branch 'svn-trunk'
[collectd.git] / debian / collectd.conffiles
1 etc/collectd.conf