From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Nov 2017 21:15:11 +0000 (+0100)
Subject: Merge branch 'collectd-5.7' into collectd-5.8
X-Git-Tag: collectd-5.8.0~12^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=196f5bd17880d91ba0da33a8f5f6168d039cfa0c;p=collectd.git

Merge branch 'collectd-5.7' into collectd-5.8
---

196f5bd17880d91ba0da33a8f5f6168d039cfa0c