Code

Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Sep 2009 20:17:49 +0000 (22:17 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Sep 2009 20:17:49 +0000 (22:17 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge