Code

Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Mar 2009 17:41:27 +0000 (18:41 +0100)
1  2 
configure.in
src/collectd.conf.in

diff --cc configure.in
Simple merge
Simple merge