From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 3 Mar 2016 21:16:10 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bda2a5648c87a2c5b8304238cd80ff17984c5cd;p=thirdparty%2Fcollectd.git

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

2bda2a5648c87a2c5b8304238cd80ff17984c5cd