From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 3 Mar 2016 20:32:38 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~41
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=aedf67e69cbe93a6925fd1004a7c8b990aed4b0a;hp=aedf67e69cbe93a6925fd1004a7c8b990aed4b0a;p=collectd.git

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