Code

Merge remote-tracking branch 'origin/pr/985'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:07:07 +0000 (00:07 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:07:07 +0000 (00:07 +0200)
1  2 
src/collectd.conf.pod

Simple merge