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)
commit96b920e6b7bf70560eb95c911202afbeaab2b965
treef91936d0fa143122f740133ec4849f11e183c30e
parent01761867ced7bc5fe71546baf350be4a3e800600
parent2739b2c65f22e459d947bdd10cb9a9807ca729e8
Merge branch 'collectd-5.6' into collectd-5.7

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