From: Florian Forster <octo@collectd.org>
Date: Fri, 2 Sep 2016 07:33:10 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~111
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=915fb28ee1a2fb80f1f0b73f2869bcf981c932c2

Merge branch 'collectd-5.6'
---

915fb28ee1a2fb80f1f0b73f2869bcf981c932c2