From: Matthias Runge <mrunge@redhat.com>
Date: Mon, 31 Aug 2020 14:29:15 +0000 (+0200)
Subject: Merge pull request #3552 from octo/merge-511-512
X-Git-Tag: collectd-5.12.0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=976970f8007a1bf6732c9bfc44089794ee03be18;p=thirdparty%2Fcollectd.git

Merge pull request #3552 from octo/merge-511-512

Merge 5.11 into 5.12
---

976970f8007a1bf6732c9bfc44089794ee03be18