From: Florian Forster Date: Thu, 17 Dec 2015 12:41:18 +0000 (+0100) Subject: Merge branch 'collectd-5.4' into collectd-5.5 X-Git-Tag: collectd-5.5.1~13 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ea3a86f0ff50f12650aae7eea033984a8ae0eba5 Merge branch 'collectd-5.4' into collectd-5.5 --- ea3a86f0ff50f12650aae7eea033984a8ae0eba5