From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 9 Feb 2016 22:27:12 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7f5868ee0378791ccd8d1788e27ebf2a02737dc;p=thirdparty%2Fcollectd.git

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

f7f5868ee0378791ccd8d1788e27ebf2a02737dc