From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 24 Feb 2015 08:57:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=587f01f89af11c4acebbec44293528b77c779218;p=thirdparty%2Fcollectd.git

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

587f01f89af11c4acebbec44293528b77c779218