From: Florian Forster <octo@collectd.org>
Date: Thu, 8 Sep 2016 06:11:42 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~107
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e62ca6291b991412d3d8cbcecd4274b8c66a457d

Merge branch 'collectd-5.6'
---

e62ca6291b991412d3d8cbcecd4274b8c66a457d