Code

Merge branch 'mg/jitter'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 18 Aug 2009 19:39:03 +0000 (21:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 18 Aug 2009 19:39:03 +0000 (21:39 +0200)
1  2 
src/collectd.conf.pod

Simple merge