From: Florian Forster <octo@collectd.org>
Date: Tue, 13 Sep 2016 20:26:31 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=02f8dbc0985310574ea2837cd5e3c06cccda203d;p=collectd.git

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

02f8dbc0985310574ea2837cd5e3c06cccda203d