Merge branch 'collectd-4.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 31 Aug 2007 14:10:33 +0000 (16:10 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 31 Aug 2007 14:10:33 +0000 (16:10 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge