Merge branch 'collectd-5.5'

diff --cc src/Makefile.am
Simple merge

diff --cc src/collectd-nagios.c
Simple merge

diff --cc src/collectd.conf.pod
index 9a8d2c1fc93bf7b8d09f0f30b8a2de19a38a5f5f,9bb348f71a1cad5500b28da2494bad6e30cd9e70..bd39295e54deac93f7b5aff5ff5dd4135542a487
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -510,12 -501,10 +510,12 @@@ are disabled by default
  
  =head2 Plugin C<amqp>
  
- The I<AMQMP plugin> can be used to communicate with other instances of
+ The I<AMQP plugin> can be used to communicate with other instances of
  I<collectd> or third party applications using an AMQP message broker. Values
  are sent to or received from the broker, which handles routing, queueing and
 -possibly filtering or messages.
 +possibly filtering out messages.
 +
 +B<Synopsis:>
  
   <Plugin "amqp">
     # Send values to an AMQP broker

diff --cc src/daemon/collectd.c
Simple merge

diff --cc src/daemon/configfile.c
Simple merge

diff --cc src/daemon/plugin.c
Simple merge

diff --cc src/daemon/utils_cache.c
Simple merge

diff --cc src/gmond.c
Simple merge

diff --cc src/memcached.c
Simple merge