Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 06:18:21 +0000 (08:18 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 30 Apr 2008 06:18:21 +0000 (08:18 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge