Merge remote-tracking branch 'github/pr/2435'
authorFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 17:59:46 +0000 (19:59 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 17:59:46 +0000 (19:59 +0200)
1  2 
src/collectd.conf.pod

Simple merge