From: Matthias Runge <mrunge@redhat.com>
Date: Fri, 29 Jan 2021 14:15:18 +0000 (+0100)
Subject: Merge branch 'collectd-6.0' into mlsr/collectd6-users
X-Git-Tag: 6.0.0-rc0~136^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3808%2Fhead;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-6.0' into mlsr/collectd6-users
---

61b3562b381bd32ec59e28405f578af279de4734