Merge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2

No match.