From: Zebity Spring <zebity@yahoo.com>
Date: Mon, 3 Jun 2019 06:45:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 5.10.0~31^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1bba58ed83a67ba47e7c88dca6a939ce3181a9d;p=thirdparty%2Fcollectd.git

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

a1bba58ed83a67ba47e7c88dca6a939ce3181a9d