Merge branch 'pr/846'
authorFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 4 Dec 2015 10:57:59 +0000 (11:57 +0100)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge