From: Florian Forster <octo@collectd.org>
Date: Fri, 7 Oct 2016 06:51:29 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.1~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d0408cb0dbef15d739a6b1cd047e9c94d7643329;hp=d0408cb0dbef15d739a6b1cd047e9c94d7643329;p=collectd.git

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