From: Florian Forster <octo@collectd.org>
Date: Sat, 16 Mar 2013 12:44:01 +0000 (+0100)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~36
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7285e5f59ffa4efb391485fe9b35ee02f3dc856f;p=collectd.git

Merge branch 'collectd-5.2'

Conflicts:
	src/plugin.c
---

7285e5f59ffa4efb391485fe9b35ee02f3dc856f