Merge remote-tracking branch 'github/pr/1067'
authorFlorian Forster <octo@collectd.org>
Tue, 9 Jun 2015 17:10:55 +0000 (18:10 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 9 Jun 2015 17:10:55 +0000 (18:10 +0100)
1  2 
src/collectd.conf.pod

Simple merge