Merge branch 'master' into katzj/memory
[collectd.git] / NEWS