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

Merge branch 'collectd-5.6'
---

b4a45047de41551b5b8879eba548dcf2a199fa9b