octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
[collectd.git] / debian / collectd.conffiles
1 etc/collectd.conf