From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 22:07:14 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9a6df05238501ca41931af0d8d51acea716c105;p=thirdparty%2Fcollectd.git

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

f9a6df05238501ca41931af0d8d51acea716c105