From: Florian Forster <octo@collectd.org>
Date: Mon, 18 Sep 2017 14:15:23 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~98
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1ecde57a53fc7c50e6b0139ad745b868413d420c;hp=746faef9ffc8c263382356ada9a008564f5288b4;p=collectd.git

Merge branch 'collectd-5.7'
---