Merge branch 'collectd-4.0'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 12 Jun 2007 06:55:29 +0000 (08:55 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 12 Jun 2007 06:55:29 +0000 (08:55 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge