Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:11:25 +0000 (13:11 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:11:25 +0000 (13:11 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge