From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 19 Mar 2016 15:47:33 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f14feb1eddfe5760a64640b98ab7bbc5c493f614;p=thirdparty%2Fcollectd.git

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

f14feb1eddfe5760a64640b98ab7bbc5c493f614