Merge commit 'octo/master'
[collectd.git] / NEWS