From: Florian Forster <octo@collectd.org>
Date: Mon, 28 Nov 2016 21:23:04 +0000 (+0100)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~9
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=87e53c90047eb1ff8818105762ff997a5cfea4ad

Merge branch 'collectd-5.6'
---

87e53c90047eb1ff8818105762ff997a5cfea4ad