Code

Merge branch 'collectd-3.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 21 Dec 2006 19:40:49 +0000 (20:40 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 21 Dec 2006 19:40:49 +0000 (20:40 +0100)
commite913f3f6b71b0ba4abd6aaf2202100a5cef48b75
tree762ee9cd75bd7a8e873eed34c3923087d9d0e385
parent02c24d0cd1860a7af773671af356e86fd6b9cac8
parent6f8769a51a656fb136319ddc5e1d0ec7864ce510
Merge branch 'collectd-3.10'

Conflicts:

ChangeLog
ChangeLog
configure.in
src/collectd.c