Merge branch 'pr/1395'
authorFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 15:39:30 +0000 (16:39 +0100)
1  2 
src/collectd.conf.pod

Simple merge