Merge branch 'er/ted'
[collectd.git] / NEWS