From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 11:41:09 +0000 (+0100)
Subject: Merge branch 'collectd-5.0' into collectd-5.1
X-Git-Tag: collectd-5.2.0~7^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b850c79322880d2b1936bc8babaf42e3657d942b;p=collectd.git

Merge branch 'collectd-5.0' into collectd-5.1
---

b850c79322880d2b1936bc8babaf42e3657d942b