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

[Florian Forster]

 0 files changed

New commits:
commit 7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e
Merge: f709381fdef43b1857ffb72c2a2721b2a75ecd71 8cc583bb44d46a2333b92d8ff4619fce2de5f30f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 11:01:19 2007 +0200

    Merge branch 'collectd-3.11' into collectd-4.0
    
    Conflicts:
    
    	src/apcups.c
    
    nothing added to commit but untracked files present (use "git add" to track)

commit 8cc583bb44d46a2333b92d8ff4619fce2de5f30f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 10:58:53 2007 +0200

    apcups plugin: Warn about the irritating name `apcups_charge_pct'.