From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 30 May 2016 20:09:07 +0000 (+0200)
Subject: Merged branch 'collectd-4.10' into collectd-5.4.
X-Git-Tag: collectd-5.5.2~6^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git

Merged branch 'collectd-4.10' into collectd-5.4.
---

c1219a1c9db2e8400e2ee94b87f86ccd441485d5