Merge remote-tracking branch 'github/pr/2434'
authorFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 20:00:14 +0000 (22:00 +0200)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge