Merge branch 'collectd-4.10' into collectd-5.0

diff --cc README
index 6badeec,34caa85..ac79ce5
--- 1/README
--- 2/README
+++ b/README
@@@ -632,13 -606,10 +632,14 @@@ Prerequisite
      <http://code.google.com/p/protobuf-c/>
  
    * libpython (optional)
-     Used by the `python' plugin. Currently, only 2.3 ≦ Python < 3 is supported.
+     Used by the `python' plugin. Currently, Python 2.3 and later and Python 3
+     are supported.
      <http://www.python.org/>
  
 +  * librabbitmq (optional; also called “rabbitmq-c”)
 +    Used by the AMQP plugin for AMQP connections, for example to RabbitMQ.
 +    <http://hg.rabbitmq.com/rabbitmq-c/>
 +
    * librouteros (optional)
      Used by the `routeros' plugin to connect to a device running `RouterOS'.
      <http://verplant.org/librouteros/>

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/common.c
Simple merge

diff --cc src/ipvs.c
Simple merge

diff --cc src/oracle.c
Simple merge

diff --cc src/python.c
Simple merge