Merge branch 'collectd-5.8'
authorFlorian Forster <octo@collectd.org>
Fri, 1 Dec 2017 10:25:18 +0000 (11:25 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 1 Dec 2017 10:25:18 +0000 (11:25 +0100)
1  2 
src/rrdtool.c

diff --cc src/rrdtool.c
Simple merge