From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 8 Jan 2014 17:24:27 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.4.1~3^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=affac33e83584e7538c358e3bd0a587d0c692bc3;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.3
---

affac33e83584e7538c358e3bd0a587d0c692bc3