From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 6 Mar 2016 11:09:29 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~402
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=17b60946497048b34b417aa0497607f3aa6a34f3;p=collectd.git

Merge branch 'collectd-5.5'
---

17b60946497048b34b417aa0497607f3aa6a34f3