From: Florian Forster <octo@collectd.org>
Date: Mon, 25 Jul 2016 11:52:16 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=49ac868d2346c77335272b8a643bca295db9feaa;p=collectd.git

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

49ac868d2346c77335272b8a643bca295db9feaa