Code

Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)
1  2 
src/apcups.c
src/collectd.conf.in
src/collectd.conf.pod

diff --cc src/apcups.c
Simple merge
Simple merge
Simple merge