Merge branch 'pr/2454'
authorFlorian Forster <octo@collectd.org>
Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 29 Sep 2017 14:24:47 +0000 (16:24 +0200)
commitda9559cff40c0c7e1f0a7b309487eb133cb2b0a8
tree0ef4f035f9eb61d61c54fa30b177ef8f96fddf29
parent4eca75de34e9c3d7f2391b9c7a5951a27a713804
parentc0e8b0392fed8ee776db4942af52be4d4b83069d
Merge branch 'pr/2454'
src/collectd.conf.in
src/collectd.conf.pod