From: Florian Forster <octo@collectd.org>
Date: Tue, 16 May 2017 17:34:25 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~6
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=fbaf81a04c23d51947d94a5c7d9142290dff07bc;p=collectd.git

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

fbaf81a04c23d51947d94a5c7d9142290dff07bc