Merge branch 'master' of https://github.com/collectd/collectd
authorZebity Spring <zebity@yahoo.com>
Sat, 9 Nov 2019 01:42:54 +0000 (12:42 +1100)
committerZebity Spring <zebity@yahoo.com>
Sat, 9 Nov 2019 01:42:54 +0000 (12:42 +1100)

Trivial merge