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

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

43d22c19485997e82d28a9ed7ba17965882dc27f