Code

Merge branch 'collectd-4.8'
authorFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 21 Oct 2009 08:21:10 +0000 (10:21 +0200)
1  2 
README
configure.in
src/collectd.conf.in

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