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)
commit306810f293c3bc1f3cbf2793a228d2113500e573
treeb4a9f0d16c0a1af5f905a304d0b1ac0dbd809e55
parent8a0163fec85502d1641757f2e3f536d498c7f2b8
parenteaf8c7a28723dc81fc035e3a15a0ca1dbb46090c
Merge branch 'ff/statsd'
src/collectd.conf.in
src/collectd.conf.pod