Merge branch 'sh/master'
[collectd.git] / NEWS