Merge branch 'collectd-3.11' into merge/master
[collectd.git] / NEWS