From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 7 Jan 2015 23:17:37 +0000 (+0100)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecbcaadde7dff838f09dfb04c7eb90f126e35abf;p=thirdparty%2Fcollectd.git

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

ecbcaadde7dff838f09dfb04c7eb90f126e35abf