From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 2 Apr 2015 21:05:23 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.5.0~12^2~8^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b61a03b05c1f4040a6599334b65141aa3bd134f5;p=collectd.git

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

b61a03b05c1f4040a6599334b65141aa3bd134f5