From: Florian Forster <octo@google.com>
Date: Mon, 14 Sep 2020 07:54:48 +0000 (+0200)
Subject: Merge branch 'collectd-5.12' into main
X-Git-Tag: 6.0.0-rc0~140^2~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4a0856c98517287770d48f633c9850f6be6f8f;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.12' into main
---

2f4a0856c98517287770d48f633c9850f6be6f8f