From: Florian Forster Date: Thu, 26 Nov 2015 13:22:20 +0000 (+0100) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.1~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc6f1e3d33d646391adb5cedc62e7b3904c15003;p=thirdparty%2Fcollectd.git Merge branch 'collectd-5.4' into collectd-5.5 --- fc6f1e3d33d646391adb5cedc62e7b3904c15003