From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 14 Oct 2015 07:10:38 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~57
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c4da209d3b3ef23d03617c15abc3c8365c0ffd2b;p=collectd.git

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

c4da209d3b3ef23d03617c15abc3c8365c0ffd2b