Merge remote-tracking branch 'github/pr/1979'
authorFlorian Forster <octo@collectd.org>
Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 26 Sep 2017 09:57:34 +0000 (11:57 +0200)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge