From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 21 Jan 2016 20:26:38 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=218c57128f2e54960133cff3e774b5ef9944068a;p=thirdparty%2Fcollectd.git

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

218c57128f2e54960133cff3e774b5ef9944068a