From: Florian Forster <octo@collectd.org>
Date: Sat, 16 Mar 2013 12:43:26 +0000 (+0100)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.2~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3b51243382501d5f3cdda79d30c7ecf39d22dd87;p=collectd.git

Merge branch 'collectd-5.1' into collectd-5.2
---

3b51243382501d5f3cdda79d30c7ecf39d22dd87