From: Florian Forster <octo@collectd.org>
Date: Sun, 3 Feb 2013 10:36:48 +0000 (+0100)
Subject: Merge branch 'collectd-5.1' into collectd-5.2
X-Git-Tag: collectd-5.2.2~13
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c7b0f0b0267f2ab7c84eea8306f0a516f5b8f769;p=collectd.git

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

c7b0f0b0267f2ab7c84eea8306f0a516f5b8f769