From: Florian Forster <octo@collectd.org>
Date: Thu, 20 Jul 2017 07:11:09 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.8.0~1^2~17
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=96b920e6b7bf70560eb95c911202afbeaab2b965

Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
	src/rrdtool.c
---

96b920e6b7bf70560eb95c911202afbeaab2b965