Code

Merge remote-tracking branch 'github/pr/734'
authorFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:09:47 +0000 (07:09 -0700)
committerFlorian Forster <octo@collectd.org>
Tue, 23 Sep 2014 14:09:47 +0000 (07:09 -0700)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge