From: Florian Forster <octo@collectd.org>
Date: Fri, 29 Sep 2017 11:05:26 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.8.0~1^2~14
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=45492ba3d0119874e2f2878d68089fc8f62268a4;p=collectd.git

Merge branch 'collectd-5.6' into collectd-5.7
---

45492ba3d0119874e2f2878d68089fc8f62268a4