From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Fri, 6 Nov 2015 09:32:55 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~51
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=dab48f284f9d4bb6ae98244310c5cdb6c5d91bf3;p=collectd.git

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

dab48f284f9d4bb6ae98244310c5cdb6c5d91bf3