From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 26 Mar 2016 18:12:20 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~375
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=82c9b0daf5ff90d01f4a4371f11727cd613e4b01;p=collectd.git

Merge branch 'collectd-5.5'
---

82c9b0daf5ff90d01f4a4371f11727cd613e4b01