Merge remote-tracking branch 'github/pr/1882'
authorFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 07:33:32 +0000 (09:33 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 07:33:32 +0000 (09:33 +0200)
1  2 
src/collectd.conf.pod

Simple merge