From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 15 Apr 2016 19:03:46 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.6.0~348^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=213eb227d7737bfbd899474033f94342c61dcb8c;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

213eb227d7737bfbd899474033f94342c61dcb8c