From: Florian Forster <octo@collectd.org>
Date: Fri, 12 May 2017 13:19:43 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~186
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=57b9e83320b35d4dbd1312db5fbf33ddf8ecd989;p=collectd.git

Merge branch 'collectd-5.7'
---

57b9e83320b35d4dbd1312db5fbf33ddf8ecd989