octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
[collectd.git] / debian / collectd.manpages
1 src/collectd.1
2 src/collectd.conf.5