From: Zebity Spring <zebity@yahoo.com>
Date: Fri, 12 Jul 2019 08:09:56 +0000 (+1000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 5.10.0~31^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a03a24fe9c268251326d46e7224b4277e47a3603;p=thirdparty%2Fcollectd.git

Merge remote-tracking branch 'upstream/master'
---

a03a24fe9c268251326d46e7224b4277e47a3603