From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 27 Oct 2015 22:39:38 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~55
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d8a02e6c6f5875dfcab7b011d1f340e3a13c9e39

Merge branch 'collectd-5.4' into collectd-5.5
---

d8a02e6c6f5875dfcab7b011d1f340e3a13c9e39