From: Florian Forster <octo@collectd.org>
Date: Sun, 7 Apr 2013 04:17:49 +0000 (+0200)
Subject: Merge branch 'collectd-5.2'
X-Git-Tag: collectd-5.3.0~12
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=47b7950c0bd0ae0b3823b8bfc4442d6a5dad36c5

Merge branch 'collectd-5.2'
---

47b7950c0bd0ae0b3823b8bfc4442d6a5dad36c5