From: Florian Forster <octo@collectd.org>
Date: Thu, 8 Dec 2016 14:42:05 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~279
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c6baff42e7e8e547eb7ca7817c0e0e07ccea95db;p=collectd.git

Merge branch 'collectd-5.7'
---

c6baff42e7e8e547eb7ca7817c0e0e07ccea95db