From: Florian Forster <octo@collectd.org>
Date: Wed, 28 Sep 2016 20:13:08 +0000 (+0200)
Subject: Merge branch 'collectd-5.6'
X-Git-Tag: collectd-5.7.0~63
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f2f7049e8faff8043b12d7c7548d9398d3b3ada4;p=collectd.git

Merge branch 'collectd-5.6'
---

f2f7049e8faff8043b12d7c7548d9398d3b3ada4