octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
[collectd.git] / debian / collectd.conffiles
1 etc/collectd.conf