From: Florian Forster <octo@collectd.org>
Date: Fri, 30 Nov 2012 06:22:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
X-Git-Tag: collectd-5.2.1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ca030dea2fcb1f16516e988ab4bd1fcba0efe7b;p=collectd.git

Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
---

7ca030dea2fcb1f16516e988ab4bd1fcba0efe7b