From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 18 Mar 2016 12:04:19 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~383
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5047407e6c0ca8b53bf1629144396702cd18cf08;p=collectd.git

Merge branch 'collectd-5.5'
---

5047407e6c0ca8b53bf1629144396702cd18cf08