From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 15 Jan 2016 16:00:30 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=778a6720a300cf549f5bcca9c22a3ef09d97f16f;p=collectd.git

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

778a6720a300cf549f5bcca9c22a3ef09d97f16f