From: Florian Forster <octo@collectd.org>
Date: Mon, 7 Nov 2016 07:43:17 +0000 (+0100)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.2~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1326af38b3ef25c41c994cd76c043202636b3d70;hp=1326af38b3ef25c41c994cd76c043202636b3d70;p=collectd.git

Merge branch 'collectd-5.5' into collectd-5.6
---