From: Florian Forster <octo@collectd.org>
Date: Fri, 12 May 2017 09:16:43 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.2~9
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=632cca47086de6cb23c32fc35802da1a19f40875;p=collectd.git

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

632cca47086de6cb23c32fc35802da1a19f40875