Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Thu, 20 Jul 2017 07:12:14 +0000 (09:12 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 20 Jul 2017 07:12:14 +0000 (09:12 +0200)
commitc99e3a4d169ada9299c73e20662d17debdc32e1f
tree633169e14e7774a11f0c6c86a3ce9b38a60bba1e
parentaf12cc40e48331f8c98294239cef60393218a46d
parent96b920e6b7bf70560eb95c911202afbeaab2b965
Merge branch 'collectd-5.7'

Conflicts:
src/rrdtool.c
src/collectd.conf.pod
src/rrdtool.c