Code

Merge branch 'collectd-4.7'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 11 May 2009 20:24:58 +0000 (22:24 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 11 May 2009 20:24:58 +0000 (22:24 +0200)
1  2 
README
configure.in
src/collectd.conf.in
src/collectd.conf.pod

diff --cc README
Simple merge
diff --cc configure.in
Simple merge
Simple merge
Simple merge