Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Thu, 20 Jul 2017 07:11:09 +0000 (09:11 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 20 Jul 2017 07:11:09 +0000 (09:11 +0200)
Conflicts:
src/rrdtool.c

1  2 
src/collectd.conf.pod
src/rrdtool.c

Simple merge
diff --cc src/rrdtool.c
Simple merge