Code

Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 11 Sep 2007 09:50:51 +0000 (11:50 +0200)
1  2 
ChangeLog
src/apcups.c

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