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

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

e0e307657d6b751d6beb5afb92c9359a6df7f5e8