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

Merge branch 'collectd-5.5'
---

b76f88c5bafa82e3c939eb65c13acd431e07cc01