From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 6 Aug 2010 13:02:57 +0000 (+0200)
Subject: Merge branch 'master' into sp/amqp
X-Git-Tag: collectd-5.0.0-beta0~28^2~13
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=91ca6eb3c01b7f9bbcfd624dfbfcb8910dc65098;p=collectd.git

Merge branch 'master' into sp/amqp
---

91ca6eb3c01b7f9bbcfd624dfbfcb8910dc65098