From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 20 Sep 2016 19:23:09 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.6.1~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7b05ebf3311b4c6cb5289f1f7cd8ee02918ef92;p=thirdparty%2Fcollectd.git

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

f7b05ebf3311b4c6cb5289f1f7cd8ee02918ef92