From: Ruben Kerkhof Date: Fri, 15 Apr 2016 09:32:22 +0000 (+0200) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.2~24 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c346dc6b18ee4215ccab911c1732c5c39a961baf Merge branch 'collectd-5.4' into collectd-5.5 --- c346dc6b18ee4215ccab911c1732c5c39a961baf