Merge branch 'pr/1918'
authorFlorian Forster <octo@collectd.org>
Fri, 16 Sep 2016 08:50:34 +0000 (10:50 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 16 Sep 2016 08:50:34 +0000 (10:50 +0200)
1  2 
src/collectd.conf.pod

Simple merge