From: Florian Forster <octo@collectd.org>
Date: Sat, 28 Jan 2012 11:26:41 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.3~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ecefb9fb8183eadee48538553615c0425e51f69;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.0
---

4ecefb9fb8183eadee48538553615c0425e51f69
diff --cc README
index 6badeecd,34caa85d..ac79ce50
--- a/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/>