From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 20 May 2016 10:51:25 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~298
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=826293bf3acfdcee6632f5d8f0b6be013f2cebab;p=collectd.git

Merge branch 'collectd-5.5'
---

826293bf3acfdcee6632f5d8f0b6be013f2cebab