Merge branch 'pr/2454'
authorFlorian Forster <octo@collectd.org>
Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge