Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	contrib/redhat/collectd.spec

diff --cc contrib/redhat/collectd.spec
index 43704c4,6c73325..7d60f7d
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2025,15 -1892,6 +2029,12 @@@ f
  %doc contrib/
  
  %changelog
- * Wed Aug 06 2014 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-2
- - Enabled modbus plugin
- 
 +* Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.0-1
 +- New upstream version
 +- Build netlink plugin by default
 +- Enable cgroups, lvm and statsd plugins
 +- Enable (but don't build by default) mic, aquaero and sigrok plugins
 +
  * Tue Aug 06 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-1
  - New upstream version
  - Added RHEL5 support:

diff --cc src/collectd.conf.in
Simple merge