From: Florian Forster <octo@collectd.org>
Date: Thu, 21 Sep 2017 15:22:39 +0000 (+0200)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.8.0~1^2~15
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=01d23e3f5daf016d03f82d92a76be2fe3decdca4

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

01d23e3f5daf016d03f82d92a76be2fe3decdca4