ChangeLog: Fix a merge bug.
[collectd.git] / NEWS