Merge remote-tracking branch 'github/pr/2437'
authorFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 10:31:37 +0000 (12:31 +0200)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge