From: Ruben Kerkhof Date: Fri, 10 Jun 2016 07:47:53 +0000 (+0200) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=65c20e41cfad6e7ab024983f561835fd347124ce;p=collectd.git Merge branch 'collectd-5.4' into collectd-5.5 --- 65c20e41cfad6e7ab024983f561835fd347124ce