From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 6 Dec 2015 15:43:11 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~518
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=584f57cc8cfb14cbcc45714db5dc87304ccb2a0e;p=collectd.git

Merge branch 'collectd-5.5'
---

584f57cc8cfb14cbcc45714db5dc87304ccb2a0e