Merge branch 'collectd-4.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Aug 2007 08:55:03 +0000 (10:55 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Aug 2007 08:55:03 +0000 (10:55 +0200)
commit785feb9d2544aff7f561fbda30aa762eec9e07bc
tree9981a5c2485a153d8b49c0e274ee99e88da38ad6
parent8bf455b7a37d96404ba24fe1418a925fb9aa740a
parent6ba08d7abcd09f2a384d5dd5582e1b2ce391cf02
Merge branch 'collectd-4.0'

Conflicts:

ChangeLog
ChangeLog
configure.in
src/collectd.conf.in
src/sensors.c