From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 24 Nov 2014 08:18:44 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.4.2~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51a4e62d7d0e73d8d5822efaef1e3218b5ad0373;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.10' into collectd-5.3
---

51a4e62d7d0e73d8d5822efaef1e3218b5ad0373