From: Florian Forster <octo@collectd.org>
Date: Fri, 6 Oct 2017 07:50:40 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5dbb7471b0a7ca7506f56f4c6dbaf58e790c6b7c;p=collectd.git

Merge branch 'collectd-5.7'
---

5dbb7471b0a7ca7506f56f4c6dbaf58e790c6b7c