From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 26 Jan 2016 11:18:26 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c21ce3b44f63d706b8b200a88047db74f1a51392;p=collectd.git

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

c21ce3b44f63d706b8b200a88047db74f1a51392