From: Florian Forster <octo@collectd.org>
Date: Sat, 6 Aug 2016 18:33:54 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.6.0~3^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3d7453f6c3a13dc49e9ed6dd6d7a19202a3b087e;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

3d7453f6c3a13dc49e9ed6dd6d7a19202a3b087e