Code

Merge branch 'collectd-4.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)
1  2 
src/collectd.conf.pod
src/configfile.c

Simple merge
Simple merge