From: Florian Forster Date: Wed, 17 Jun 2015 15:29:38 +0000 (+0200) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.1~105 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6491cfcf52a74498e1becd7ef94fc8e0a5938b9;p=thirdparty%2Fcollectd.git Merge branch 'collectd-5.4' into collectd-5.5 --- d6491cfcf52a74498e1becd7ef94fc8e0a5938b9