From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 07:56:17 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b7dee8838f56233cea2854a7ddbcad2790609ce;p=thirdparty%2Fcollectd.git

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

9b7dee8838f56233cea2854a7ddbcad2790609ce