Merge branch 'collectd-4.6'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 9 Mar 2009 17:48:12 +0000 (18:48 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 9 Mar 2009 17:48:12 +0000 (18:48 +0100)
1  2 
README
src/collectd.conf.pod
src/rrdtool.c

diff --cc README
Simple merge
Simple merge
diff --cc src/rrdtool.c
Simple merge