From: Florian Forster <octo@collectd.org>
Date: Wed, 10 Sep 2014 15:15:24 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~13
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=336ea1e244e6c5d1d8bf8b42774b08c03a932039

Merge branch 'collectd-5.3' into collectd-5.4
---

336ea1e244e6c5d1d8bf8b42774b08c03a932039