From: Florian Forster <octo@collectd.org>
Date: Thu, 22 Dec 2016 09:57:43 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.1~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=bdd27cb013de89b4149393212aef1bf45a221dba

Merge branch 'collectd-5.6' into collectd-5.7
---

bdd27cb013de89b4149393212aef1bf45a221dba