Code

Changelog: fix unresolved merge conflict introduced in dc2eb04
[collectd.git] / NEWS