Merge branch 'collectd-4.4'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 6 May 2008 11:45:25 +0000 (13:45 +0200)
commitbab707fe46b2ef69f391864f3bb08b4dca19634e
tree694085270ac3cd8d1c16a8aab3c83e7aa88b83af
parentcacaa2126020832df99fa6423147bd3de6d4faae
parentaf46a5f31a0e8d4279d63d8ca9232dbd433dfb25
Merge branch 'collectd-4.4'
src/cpu.c
src/disk.c
src/powerdns.c
src/users.c