From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 1 Mar 2016 16:07:01 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~457
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ccc4feb9576f520596508418f404beb000fde1aa;p=collectd.git

Merge branch 'collectd-5.5'
---

ccc4feb9576f520596508418f404beb000fde1aa