From: Florian Forster <octo@collectd.org>
Date: Tue, 8 Dec 2015 10:33:46 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a359afebf9e55cdb46b445e3d46d728a4d6fe992;p=collectd.git

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

a359afebf9e55cdb46b445e3d46d728a4d6fe992