From: Ruben Kerkhof Date: Sun, 6 Mar 2016 11:08:59 +0000 (+0100) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.2~35 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2cf10557f58144e13793a3d69ae5d4b7c8d6c305;p=collectd.git Merge branch 'collectd-5.4' into collectd-5.5 --- 2cf10557f58144e13793a3d69ae5d4b7c8d6c305