Merge branch 'collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)
1  2 
src/collectd.conf.pod

Simple merge