From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 7 Jan 2015 22:32:21 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.3.2~11
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=443afcad2cbacaca9bb1fd7d9ea790cbeb6ff015;p=collectd.git

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

443afcad2cbacaca9bb1fd7d9ea790cbeb6ff015