Merging with changes made by Florian Foster.
[collectd.git] / NEWS