Merge remote branch 'jeromer/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 16 Jun 2010 12:23:43 +0000 (14:23 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 16 Jun 2010 12:23:43 +0000 (14:23 +0200)
1  2 
src/collectd.conf.pod

Simple merge