Code

Merge branch 'ff/statsd'
authorFlorian Forster <octo@collectd.org>
Wed, 2 Dec 2015 09:49:36 +0000 (10:49 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 2 Dec 2015 09:49:36 +0000 (10:49 +0100)
1  2 
src/collectd.conf.in
src/collectd.conf.pod

Simple merge
Simple merge