From: Florian Forster Date: Wed, 9 Dec 2015 08:49:55 +0000 (+0100) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.1~19 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0657d95eaa686d64efe6bbccda346ebd6467bd0b;p=collectd.git Merge branch 'collectd-5.4' into collectd-5.5 --- 0657d95eaa686d64efe6bbccda346ebd6467bd0b