[collectd-changes] collectd, the system statistics collection daemon: Changes to 'collectd-4.1'

[Florian Forster]

 ChangeLog    |    6 ++++++
 src/apcups.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e6fc1600ee7bcde75c95db9b1f617caf78fc4c6a
Merge: 97deb523823b1f04880d584a19bc2b0e7e10d96a 6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Sep 13 10:01:23 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1
    
    Conflicts:
    
    	ChangeLog

commit 6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Sep 13 09:56:04 2007 +0200

    apcups plugin: Fix reporting of the `load percent' data.